Merge pull request #11 from p1heidary/master

Compatible with G4-11.0.0

examples/detector/optical/CsI.tg

@@ -1,11 +1,12 @@
 :prop G4_CESIUM_IODIDE
   SCINTILLATIONYIELD 100./keV
   RESOLUTIONSCALE 2.
-  FASTTIMECONSTANT 2*ns
-  SLOWTIMECONSTANT 1000*ns
-  YIELDRATIO 0.05
+  SCINTILLATIONTIMECONSTANT1 2*ns
+  SCINTILLATIONTIMECONSTANT2 1000*ns
+  SCINTILLATIONYIELD1 95
+  SCINTILLATIONYIELD2  5
   photon_energies 100 2.5*eV 2.525*eV 2.55*eV 2.575*eV 2.6*eV 2.625*eV 2.65*eV 2.675*eV 2.7*eV 2.725*eV 2.75*eV 2.775*eV 2.8*eV 2.825*eV 2.85*eV 2.875*eV 2.9*eV 2.925*eV 2.95*eV 2.975*eV 3*eV 3.025*eV 3.05*eV 3.075*eV 3.1*eV 3.125*eV 3.15*eV 3.175*eV 3.2*eV 3.225*eV 3.25*eV 3.275*eV 3.3*eV 3.325*eV 3.35*eV 3.375*eV 3.4*eV 3.425*eV 3.45*eV 3.475*eV 3.5*eV 3.525*eV 3.55*eV 3.575*eV 3.6*eV 3.625*eV 3.65*eV 3.675*eV 3.7*eV 3.725*eV 3.75*eV 3.775*eV 3.8*eV 3.825*eV 3.85*eV 3.875*eV 3.9*eV 3.925*eV 3.95*eV 3.975*eV 4*eV 4.025*eV 4.05*eV 4.075*eV 4.1*eV 4.125*eV 4.15*eV 4.175*eV 4.2*eV 4.225*eV 4.25*eV 4.275*eV 4.3*eV 4.325*eV 4.35*eV 4.375*eV 4.4*eV 4.425*eV 4.45*eV 4.475*eV 4.5*eV 4.525*eV 4.55*eV 4.575*eV 4.6*eV 4.625*eV 4.65*eV 4.675*eV 4.7*eV 4.725*eV 4.75*eV 4.775*eV 4.8*eV 4.825*eV 4.85*eV 4.875*eV 4.9*eV 4.925*eV 4.95*eV 4.975*eV
-  FASTCOMPONENT 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3.152e-05 0.0001002 0.000299 0.0008387 0.00221 0.005469 0.01272 0.02777 0.05699 0.1098 0.1989 0.3383 0.5407 0.8116 1.145 1.516 1.887 2.206 2.423 2.5 2.423 2.206 1.887 1.516 1.145 0.8116 0.5407 0.3383 0.1989 0.1098 0.05699 0.02777 0.01272 0.005469 0.00221 0.0008387 0.000299 0.0001002 3.152e-05 0 0 0 0 0 0 0 0
-  SLOWCOMPONENT 0 0 0 0 0 0 0 1.055e-05 1.95e-05 3.548e-05 6.355e-05 0.0001121 0.0001945 0.0003324 0.0005594 0.0009266 0.001511 0.002426 0.003835 0.005967 0.009141 0.01379 0.02047 0.02993 0.04307 0.06102 0.08512 0.1169 0.158 0.2103 0.2756 0.3556 0.4516 0.5647 0.6951 0.8424 1.005 1.181 1.365 1.554 1.742 1.922 2.088 2.233 2.351 2.438 2.488 2.499 2.472 2.407 2.308 2.178 2.024 1.851 1.667 1.478 1.291 1.109 0.9383 0.7815 0.6409 0.5174 0.4112 0.3217 0.2478 0.188 0.1403 0.1032 0.07465 0.05318 0.0373 0.02576 0.01751 0.01172 0.007722 0.005009 0.003199 0.002011 0.001245 0.0007586 0.0004551 0.0002688 0.0001563 8.948e-05 5.043e-05 2.798e-05 1.528e-05 0 0 0 0 0 0 0 0 0 0 0 0 0
+  SCINTILLATIONCOMPONENT1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3.152e-05 0.0001002 0.000299 0.0008387 0.00221 0.005469 0.01272 0.02777 0.05699 0.1098 0.1989 0.3383 0.5407 0.8116 1.145 1.516 1.887 2.206 2.423 2.5 2.423 2.206 1.887 1.516 1.145 0.8116 0.5407 0.3383 0.1989 0.1098 0.05699 0.02777 0.01272 0.005469 0.00221 0.0008387 0.000299 0.0001002 3.152e-05 0 0 0 0 0 0 0 0
+  SCINTILLATIONCOMPONENT2 0 0 0 0 0 0 0 1.055e-05 1.95e-05 3.548e-05 6.355e-05 0.0001121 0.0001945 0.0003324 0.0005594 0.0009266 0.001511 0.002426 0.003835 0.005967 0.009141 0.01379 0.02047 0.02993 0.04307 0.06102 0.08512 0.1169 0.158 0.2103 0.2756 0.3556 0.4516 0.5647 0.6951 0.8424 1.005 1.181 1.365 1.554 1.742 1.922 2.088 2.233 2.351 2.438 2.488 2.499 2.472 2.407 2.308 2.178 2.024 1.851 1.667 1.478 1.291 1.109 0.9383 0.7815 0.6409 0.5174 0.4112 0.3217 0.2478 0.188 0.1403 0.1032 0.07465 0.05318 0.0373 0.02576 0.01751 0.01172 0.007722 0.005009 0.003199 0.002011 0.001245 0.0007586 0.0004551 0.0002688 0.0001563 8.948e-05 5.043e-05 2.798e-05 1.528e-05 0 0 0 0 0 0 0 0 0 0 0 0 0
   RINDEX 1.808 1.809 1.811 1.812 1.814 1.816 1.817 1.819 1.82 1.822 1.824 1.826 1.827 1.829 1.831 1.833 1.835 1.837 1.838 1.84 1.842 1.844 1.846 1.849 1.851 1.853 1.855 1.857 1.86 1.862 1.864 1.867 1.869 1.871 1.874 1.876 1.879 1.882 1.884 1.887 1.89 1.893 1.895 1.898 1.901 1.904 1.907 1.91 1.914 1.917 1.92 1.923 1.927 1.93 1.934 1.937 1.941 1.945 1.949 1.953 1.957 1.961 1.965 1.969 1.973 1.978 1.982 1.987 1.991 1.996 2.001 2.006 2.011 2.017 2.022 2.027 2.033 2.039 2.045 2.051 2.057 2.063 2.07 2.077 2.083 2.091 2.098 2.105 2.113 2.121 2.129 2.138 2.146 2.155 2.165 2.174 2.184 2.195 2.205 2.216
   ABSLENGTH 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 

examples/detector/optical/CsI3inWLS.mac

@@ -1,6 +1,7 @@
 /geometry/source CsI3inWLS.tg
 
-/physics_lists/enable Optical
+/physics_lists/select QGSC_BERT_EMZ
+/physics_lists/factory/addOptical
 /process/optical/processActivation Scintillation
 /process/optical/processActivation OpBoundary
 /process/optical/processActivation OpAbsorption false

examples/output/radiate.mac

@@ -38,7 +38,7 @@
 /vis/disable
 /tracking/verbose 0
 # turn on data recording
-/analysis/setFileName gears
+/analysis/setFileName gears.root
 # turn on progress report
 /run/verbose 2
 /run/printProgress 10000

examples/physics/alpha/BraggCurve.mac

@@ -43,7 +43,7 @@
 # turn off screen printing for fast simulation 
 /tracking/verbose 0
 # turn on data recording
-/analysis/setFileName air
+/analysis/setFileName air.root
 # turn on progress report
 /run/verbose 2
 /run/printProgress 1000

examples/physics/beta/air.mac

@@ -21,7 +21,7 @@
 /run/beamOn 30
 
 /control/shell rm -f *.pdf
-/vis/ogl/export air
+/vis/ogl/export air.pdf
 
 # the following needs dawn to be installed
 /control/shell dawn -c

examples/physics/decay/Pb210.mac

@@ -24,6 +24,6 @@
 /tracking/verbose 2
 # show how a track is passed between the stacking and tracking managers
 /event/verbose 2
-/analysis/setFileName output
+/analysis/setFileName output.root
 # one event is enough to demonstrate the process
 /run/beamOn 1

examples/physics/gamma/air.mac

@@ -21,7 +21,7 @@
 /run/beamOn 100
 
 /control/shell rm -f *.pdf
-/vis/ogl/export air
+/vis/ogl/export air.pdf
 
 # the following needs dawn to be installed
 /control/shell dawn -c

examples/physics/neutron/DT.mac

@@ -36,7 +36,7 @@
 /tracking/verbose 0
 
 # turn on data recording
-/analysis/setFileName concrete
+/analysis/setFileName concrete.root
 # turn on progress report
 /run/verbose 2
 /run/printProgress 1000

examples/physics/neutron/Gd/thermal.mac

@@ -13,7 +13,7 @@
 /tracking/verbose 1
 /run/beamOn 1
 
-/analysis/setFileName output
+/analysis/setFileName output.root
 
 /tracking/verbose 0
 /run/verbose 2

gears.cc

@@ -4,7 +4,7 @@
  */
 #include <vector>
 using namespace std;
-#include <g4root.hh>
+#include <G4AnalysisManager.hh>
 #include <G4SteppingVerbose.hh>
 #include <G4SteppingManager.hh>
 /**