Added photon angular distribution from ZDC simulation. Added two new models

CMakeLists.txt

@@ -74,4 +74,5 @@ install(TARGETS lightGuide DESTINATION bin )
 install(TARGETS plotHisto DESTINATION bin )
 install(FILES run1.mac DESTINATION bin )
 install(FILES vis.mac DESTINATION bin)
+install(FILES hist.mac DESTINATION bin)
 install(DIRECTORY models/ DESTINATION models)

hist.mac

+/gps/hist/type theta
+/gps/hist/point 0.000000 0.000000
+/gps/hist/point 0.008726 0.001677
+/gps/hist/point 0.026179 0.002438
+/gps/hist/point 0.043632 0.002966
+/gps/hist/point 0.061085 0.003407
+/gps/hist/point 0.078538 0.003771
+/gps/hist/point 0.095990 0.004110
+/gps/hist/point 0.113443 0.004415
+/gps/hist/point 0.130896 0.004724
+/gps/hist/point 0.148349 0.005010
+/gps/hist/point 0.165801 0.005293
+/gps/hist/point 0.183254 0.005592
+/gps/hist/point 0.200707 0.005862
+/gps/hist/point 0.218160 0.006130
+/gps/hist/point 0.235613 0.006412
+/gps/hist/point 0.253065 0.006682
+/gps/hist/point 0.270518 0.006950
+/gps/hist/point 0.287971 0.007234
+/gps/hist/point 0.305424 0.007515
+/gps/hist/point 0.322876 0.007781
+/gps/hist/point 0.340329 0.008063
+/gps/hist/point 0.357782 0.008323
+/gps/hist/point 0.375235 0.008598
+/gps/hist/point 0.392687 0.008907
+/gps/hist/point 0.410140 0.009175
+/gps/hist/point 0.427593 0.009454
+/gps/hist/point 0.445046 0.009775
+/gps/hist/point 0.462499 0.010074
+/gps/hist/point 0.479951 0.010385
+/gps/hist/point 0.497404 0.010707
+/gps/hist/point 0.514857 0.011049
+/gps/hist/point 0.532310 0.011366
+/gps/hist/point 0.549762 0.011748
+/gps/hist/point 0.567215 0.012158
+/gps/hist/point 0.584668 0.012550
+/gps/hist/point 0.602121 0.012953
+/gps/hist/point 0.619574 0.013384
+/gps/hist/point 0.637026 0.013836
+/gps/hist/point 0.654479 0.014333
+/gps/hist/point 0.671932 0.014900
+/gps/hist/point 0.689385 0.015575
+/gps/hist/point 0.706837 0.016303
+/gps/hist/point 0.724290 0.017249
+/gps/hist/point 0.741743 0.018648
+/gps/hist/point 0.759196 0.019849
+/gps/hist/point 0.776649 0.020756
+/gps/hist/point 0.794101 0.021327
+/gps/hist/point 0.811554 0.019696
+/gps/hist/point 0.829007 0.018203
+/gps/hist/point 0.846460 0.017120
+/gps/hist/point 0.863912 0.016291
+/gps/hist/point 0.881365 0.015641
+/gps/hist/point 0.898818 0.015079
+/gps/hist/point 0.916271 0.014629
+/gps/hist/point 0.933724 0.014212
+/gps/hist/point 0.951176 0.013883
+/gps/hist/point 0.968629 0.013545
+/gps/hist/point 0.986082 0.013284
+/gps/hist/point 1.003535 0.013057
+/gps/hist/point 1.020988 0.012847
+/gps/hist/point 1.038440 0.012644
+/gps/hist/point 1.055893 0.012443
+/gps/hist/point 1.073346 0.012321
+/gps/hist/point 1.090799 0.012159
+/gps/hist/point 1.108251 0.012022
+/gps/hist/point 1.125704 0.011891
+/gps/hist/point 1.143157 0.011784
+/gps/hist/point 1.160610 0.011684
+/gps/hist/point 1.178063 0.011600
+/gps/hist/point 1.195515 0.011499
+/gps/hist/point 1.212968 0.011423
+/gps/hist/point 1.230421 0.011358
+/gps/hist/point 1.247874 0.011273
+/gps/hist/point 1.265326 0.011216
+/gps/hist/point 1.282779 0.011145
+/gps/hist/point 1.300232 0.011114
+/gps/hist/point 1.317685 0.011054
+/gps/hist/point 1.335137 0.011028
+/gps/hist/point 1.352590 0.010988
+/gps/hist/point 1.370043 0.010938
+/gps/hist/point 1.387496 0.010915
+/gps/hist/point 1.404949 0.010911
+/gps/hist/point 1.422401 0.010852
+/gps/hist/point 1.439854 0.010845
+/gps/hist/point 1.457307 0.010834
+/gps/hist/point 1.474760 0.010807
+/gps/hist/point 1.492212 0.010819
+/gps/hist/point 1.509665 0.010799
+/gps/hist/point 1.527118 0.010811
+/gps/hist/point 1.544571 0.009312
+/gps/hist/point 1.562024 0.008725
+/gps/hist/point 1.570700 0.000000

run1.mac

@@ -41,16 +41,25 @@
 #/lightGuide/model/translate 0 -250 -200 mm
 #/lightGuide/model/translatePMT 0 131 0 mm
 
+#/lightGuide/model/CADmodel ../models/run2.stl
+#/lightGuide/model/rotate 0 0 0
+#/lightGuide/model/translate 200 -250 0 mm
+#/lightGuide/model/translatePMT 0 -119 0 mm
+
+#/lightGuide/model/CADmodel ../models/run3wc.stl
+#/lightGuide/model/rotate 0 0 90
+#/lightGuide/model/translate 0 -319 0 mm
+#/lightGuide/model/translatePMT 0 -119 0 mm
 
 
 #----- Set surface properties of the light guide -----
 /lightGuide/surface/Model unified
 /lightGuide/surface/Type dielectric_metal
 /lightGuide/surface/Finish ground
-/lightGuide/surface/SigmaAlpha .1
-/lightGuide/surface/Property SPECULARLOBECONSTANT 0.000002 .4 0.000008 .4
-/lightGuide/surface/Property SPECULARSPIKECONSTANT 0.000002 .1 0.000008 .1
-/lightGuide/surface/Property BACKSCATTERCONSTANT 0.000002 .05 0.000008 .05
+#/lightGuide/surface/SigmaAlpha .1
+#/lightGuide/surface/Property SPECULARLOBECONSTANT 0.000002 .4 0.000008 .4
+#/lightGuide/surface/Property SPECULARSPIKECONSTANT 0.000002 .1 0.000008 .1
+#/lightGuide/surface/Property BACKSCATTERCONSTANT 0.000002 .05 0.000008 .05
 #/lightGuide/surface/Property REFLECTIVITY 0.000002 .89 0.000008 .89
 
 
@@ -79,8 +88,8 @@
 # Rectangular plane for infinite resolution
 /gps/pos/type Plane
 /gps/pos/shape Rectangle
-/gps/pos/halfx 44.875 mm
-/gps/pos/halfy 82 mm
+/gps/pos/halfx 40 mm
+/gps/pos/halfy 68 mm
 
 # the incident surface is in the x-z plane just below the gas
 /gps/pos/rot1 1 0 0
@@ -92,11 +101,14 @@
 /gps/ang/rot2 0 0 1
 /gps/ang/type beam1d
 
-
+#----- Set beam angular dispersion from histogram -----
+/gps/ang/surfnorm false
+/gps/ang/type user
+/control/execute hist.mac
 
 #----- Set beam angular dispersion for fiber optic -----
 # N.A. is 0.22 so acceptance cone is ~25.4 degrees
-/gps/ang/sigma_r 25.40 deg
+#/gps/ang/sigma_r 25.40 deg
 
 
 

src/EventAction.cc

@@ -74,11 +74,13 @@ void EventAction::EndOfEventAction(const G4Event* event){
       PMTHit* aHit = (*HC)[0];
       // fill ntuple  //
       G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
+      G4double pTheta = atan(sqrt(pow(aHit->getMomentum().x(),2) + pow(aHit->getMomentum().z(),2) )/fabs(aHit->getMomentum().y() ));
       analysisManager->FillNtupleDColumn(0, aHit->getPos().x() );
       analysisManager->FillNtupleDColumn(1, aHit->getPos().z() );
       analysisManager->FillNtupleDColumn(2, aHit->getHit().x() );
       analysisManager->FillNtupleDColumn(3, aHit->getHit().z() );
       analysisManager->FillNtupleDColumn(4, aHit->getTime()  );
+      analysisManager->FillNtupleDColumn(5, pTheta );
       analysisManager->AddNtupleRow();
     }
   }

src/RunAction.cc

@@ -67,6 +67,7 @@ RunAction::RunAction(G4String fileName)
   analysisManager->CreateNtupleDColumn("hitX");
   analysisManager->CreateNtupleDColumn("hitZ");
   analysisManager->CreateNtupleDColumn("time");
+  analysisManager->CreateNtupleDColumn("theta");
   analysisManager->FinishNtuple();
 }