From 7ca2299aab5cef6e6d062bc1b60261e70b77f7bb Mon Sep 17 00:00:00 2001
From: deserevi <deserevi@nptool>
Date: Wed, 2 Dec 2009 09:39:17 +0000
Subject: [PATCH] * Update NPAnalysis for Gaspard - Effect of beam tracker
is now taken into account
* Add new cross-section files
---
.../132Sndp_10A_MeV_2f7_ZR_FRC.lis | 180 ++++++++++++++++++
.../132Sndp_10A_MeV_3p3_ZR_FRC.lis | 180 ++++++++++++++++++
.../132Sndp_5A_MeV_2f7_ZR_FRC.lis | 180 ++++++++++++++++++
.../132Sndp_5A_MeV_3p3_ZR_FRC.lis | 180 ++++++++++++++++++
.../CS_Ep10MeV_sn134pt_gs_1h9demi.dat | 90 +++++++++
.../CS_Ep15MeV_sn134pt_gs_1h9demi.dat | 90 +++++++++
.../CS_Ep20MeV_sn134pt_gs_1h9demi.dat | 90 +++++++++
.../gaspardTestSpheric.detector | 5 +-
Inputs/EventGenerator/132Sndp.reaction | 2 +-
NPAnalysis/Gaspard/RunToTreat.txt | 5 +-
NPAnalysis/Gaspard/include/ObjectManager.hh | 5 +
NPAnalysis/Gaspard/src/Analysis.cc | 59 +++++-
NPLib/GASPARD/GaspardTracker.cxx | 2 +-
.../include/GaspardTrackerDummyShape.hh | 16 +-
NPSimulation/src/EventGeneratorTransfert.cc | 34 ++--
NPSimulation/src/Target.cc | 4 +-
16 files changed, 1078 insertions(+), 44 deletions(-)
create mode 100644 Inputs/CrossSection/132Sndp_10A_MeV_2f7_ZR_FRC.lis
create mode 100644 Inputs/CrossSection/132Sndp_10A_MeV_3p3_ZR_FRC.lis
create mode 100644 Inputs/CrossSection/132Sndp_5A_MeV_2f7_ZR_FRC.lis
create mode 100644 Inputs/CrossSection/132Sndp_5A_MeV_3p3_ZR_FRC.lis
create mode 100644 Inputs/CrossSection/CS_Ep10MeV_sn134pt_gs_1h9demi.dat
create mode 100644 Inputs/CrossSection/CS_Ep15MeV_sn134pt_gs_1h9demi.dat
create mode 100644 Inputs/CrossSection/CS_Ep20MeV_sn134pt_gs_1h9demi.dat
diff --git a/Inputs/CrossSection/132Sndp_10A_MeV_2f7_ZR_FRC.lis b/Inputs/CrossSection/132Sndp_10A_MeV_2f7_ZR_FRC.lis
new file mode 100644
index 000000000..ce79c9769
--- /dev/null
+++ b/Inputs/CrossSection/132Sndp_10A_MeV_2f7_ZR_FRC.lis
@@ -0,0 +1,180 @@
+ 0.00 1.3462E+00
+ 1.00 1.3514E+00
+ 2.00 1.3667E+00
+ 3.00 1.3912E+00
+ 4.00 1.4235E+00
+ 5.00 1.4617E+00
+ 6.00 1.5036E+00
+ 7.00 1.5465E+00
+ 8.00 1.5880E+00
+ 9.00 1.6253E+00
+ 10.00 1.6560E+00
+ 11.00 1.6779E+00
+ 12.00 1.6892E+00
+ 13.00 1.6883E+00
+ 14.00 1.6745E+00
+ 15.00 1.6475E+00
+ 16.00 1.6074E+00
+ 17.00 1.5550E+00
+ 18.00 1.4916E+00
+ 19.00 1.4189E+00
+ 20.00 1.3388E+00
+ 21.00 1.2537E+00
+ 22.00 1.1659E+00
+ 23.00 1.0778E+00
+ 24.00 9.9188E-01
+ 25.00 9.1010E-01
+ 26.00 8.3436E-01
+ 27.00 7.6610E-01
+ 28.00 7.0638E-01
+ 29.00 6.5580E-01
+ 30.00 6.1451E-01
+ 31.00 5.8225E-01
+ 32.00 5.5836E-01
+ 33.00 5.4186E-01
+ 34.00 5.3155E-01
+ 35.00 5.2602E-01
+ 36.00 5.2380E-01
+ 37.00 5.2344E-01
+ 38.00 5.2353E-01
+ 39.00 5.2283E-01
+ 40.00 5.2029E-01
+ 41.00 5.1508E-01
+ 42.00 5.0664E-01
+ 43.00 4.9465E-01
+ 44.00 4.7904E-01
+ 45.00 4.5999E-01
+ 46.00 4.3784E-01
+ 47.00 4.1310E-01
+ 48.00 3.8641E-01
+ 49.00 3.5846E-01
+ 50.00 3.2997E-01
+ 51.00 3.0165E-01
+ 52.00 2.7416E-01
+ 53.00 2.4807E-01
+ 54.00 2.2388E-01
+ 55.00 2.0195E-01
+ 56.00 1.8253E-01
+ 57.00 1.6576E-01
+ 58.00 1.5166E-01
+ 59.00 1.4015E-01
+ 60.00 1.3106E-01
+ 61.00 1.2416E-01
+ 62.00 1.1916E-01
+ 63.00 1.1574E-01
+ 64.00 1.1356E-01
+ 65.00 1.1229E-01
+ 66.00 1.1162E-01
+ 67.00 1.1124E-01
+ 68.00 1.1090E-01
+ 69.00 1.1037E-01
+ 70.00 1.0950E-01
+ 71.00 1.0815E-01
+ 72.00 1.0624E-01
+ 73.00 1.0374E-01
+ 74.00 1.0063E-01
+ 75.00 9.6948E-02
+ 76.00 9.2758E-02
+ 77.00 8.8137E-02
+ 78.00 8.3179E-02
+ 79.00 7.7987E-02
+ 80.00 7.2667E-02
+ 81.00 6.7326E-02
+ 82.00 6.2064E-02
+ 83.00 5.6972E-02
+ 84.00 5.2130E-02
+ 85.00 4.7608E-02
+ 86.00 4.3458E-02
+ 87.00 3.9720E-02
+ 88.00 3.6417E-02
+ 89.00 3.3560E-02
+ 90.00 3.1146E-02
+ 91.00 2.9158E-02
+ 92.00 2.7571E-02
+ 93.00 2.6351E-02
+ 94.00 2.5456E-02
+ 95.00 2.4840E-02
+ 96.00 2.4455E-02
+ 97.00 2.4249E-02
+ 98.00 2.4174E-02
+ 99.00 2.4181E-02
+ 100.00 2.4225E-02
+ 101.00 2.4267E-02
+ 102.00 2.4271E-02
+ 103.00 2.4208E-02
+ 104.00 2.4056E-02
+ 105.00 2.3799E-02
+ 106.00 2.3426E-02
+ 107.00 2.2933E-02
+ 108.00 2.2323E-02
+ 109.00 2.1602E-02
+ 110.00 2.0782E-02
+ 111.00 1.9876E-02
+ 112.00 1.8903E-02
+ 113.00 1.7882E-02
+ 114.00 1.6834E-02
+ 115.00 1.5778E-02
+ 116.00 1.4735E-02
+ 117.00 1.3723E-02
+ 118.00 1.2758E-02
+ 119.00 1.1856E-02
+ 120.00 1.1029E-02
+ 121.00 1.0284E-02
+ 122.00 9.6287E-03
+ 123.00 9.0660E-03
+ 124.00 8.5967E-03
+ 125.00 8.2187E-03
+ 126.00 7.9277E-03
+ 127.00 7.7175E-03
+ 128.00 7.5802E-03
+ 129.00 7.5067E-03
+ 130.00 7.4870E-03
+ 131.00 7.5108E-03
+ 132.00 7.5676E-03
+ 133.00 7.6472E-03
+ 134.00 7.7401E-03
+ 135.00 7.8375E-03
+ 136.00 7.9313E-03
+ 137.00 8.0149E-03
+ 138.00 8.0825E-03
+ 139.00 8.1299E-03
+ 140.00 8.1539E-03
+ 141.00 8.1527E-03
+ 142.00 8.1255E-03
+ 143.00 8.0728E-03
+ 144.00 7.9958E-03
+ 145.00 7.8968E-03
+ 146.00 7.7786E-03
+ 147.00 7.6444E-03
+ 148.00 7.4980E-03
+ 149.00 7.3433E-03
+ 150.00 7.1843E-03
+ 151.00 7.0249E-03
+ 152.00 6.8691E-03
+ 153.00 6.7204E-03
+ 154.00 6.5822E-03
+ 155.00 6.4574E-03
+ 156.00 6.3484E-03
+ 157.00 6.2573E-03
+ 158.00 6.1857E-03
+ 159.00 6.1345E-03
+ 160.00 6.1042E-03
+ 161.00 6.0948E-03
+ 162.00 6.1056E-03
+ 163.00 6.1357E-03
+ 164.00 6.1836E-03
+ 165.00 6.2475E-03
+ 166.00 6.3252E-03
+ 167.00 6.4144E-03
+ 168.00 6.5123E-03
+ 169.00 6.6163E-03
+ 170.00 6.7236E-03
+ 171.00 6.8313E-03
+ 172.00 6.9367E-03
+ 173.00 7.0369E-03
+ 174.00 7.1296E-03
+ 175.00 7.2123E-03
+ 176.00 7.2829E-03
+ 177.00 7.3397E-03
+ 178.00 7.3814E-03
+ 179.00 7.4068E-03
diff --git a/Inputs/CrossSection/132Sndp_10A_MeV_3p3_ZR_FRC.lis b/Inputs/CrossSection/132Sndp_10A_MeV_3p3_ZR_FRC.lis
new file mode 100644
index 000000000..e88fba66a
--- /dev/null
+++ b/Inputs/CrossSection/132Sndp_10A_MeV_3p3_ZR_FRC.lis
@@ -0,0 +1,180 @@
+ 0.00 1.0371E+00
+ 1.00 1.0303E+00
+ 2.00 1.0103E+00
+ 3.00 9.7770E-01
+ 4.00 9.3402E-01
+ 5.00 8.8111E-01
+ 6.00 8.2140E-01
+ 7.00 7.5780E-01
+ 8.00 6.9354E-01
+ 9.00 6.3199E-01
+ 10.00 5.7645E-01
+ 11.00 5.2991E-01
+ 12.00 4.9476E-01
+ 13.00 4.7268E-01
+ 14.00 4.6444E-01
+ 15.00 4.6984E-01
+ 16.00 4.8774E-01
+ 17.00 5.1611E-01
+ 18.00 5.5220E-01
+ 19.00 5.9279E-01
+ 20.00 6.3440E-01
+ 21.00 6.7364E-01
+ 22.00 7.0747E-01
+ 23.00 7.3337E-01
+ 24.00 7.4958E-01
+ 25.00 7.5507E-01
+ 26.00 7.4961E-01
+ 27.00 7.3360E-01
+ 28.00 7.0807E-01
+ 29.00 6.7443E-01
+ 30.00 6.3445E-01
+ 31.00 5.9000E-01
+ 32.00 5.4304E-01
+ 33.00 4.9542E-01
+ 34.00 4.4879E-01
+ 35.00 4.0454E-01
+ 36.00 3.6378E-01
+ 37.00 3.2725E-01
+ 38.00 2.9542E-01
+ 39.00 2.6851E-01
+ 40.00 2.4648E-01
+ 41.00 2.2916E-01
+ 42.00 2.1623E-01
+ 43.00 2.0724E-01
+ 44.00 2.0168E-01
+ 45.00 1.9899E-01
+ 46.00 1.9856E-01
+ 47.00 1.9981E-01
+ 48.00 2.0215E-01
+ 49.00 2.0506E-01
+ 50.00 2.0808E-01
+ 51.00 2.1079E-01
+ 52.00 2.1283E-01
+ 53.00 2.1391E-01
+ 54.00 2.1378E-01
+ 55.00 2.1227E-01
+ 56.00 2.0927E-01
+ 57.00 2.0476E-01
+ 58.00 1.9876E-01
+ 59.00 1.9139E-01
+ 60.00 1.8280E-01
+ 61.00 1.7318E-01
+ 62.00 1.6276E-01
+ 63.00 1.5176E-01
+ 64.00 1.4042E-01
+ 65.00 1.2899E-01
+ 66.00 1.1771E-01
+ 67.00 1.0680E-01
+ 68.00 9.6462E-02
+ 69.00 8.6886E-02
+ 70.00 7.8213E-02
+ 71.00 7.0542E-02
+ 72.00 6.3934E-02
+ 73.00 5.8409E-02
+ 74.00 5.3950E-02
+ 75.00 5.0511E-02
+ 76.00 4.8019E-02
+ 77.00 4.6380E-02
+ 78.00 4.5481E-02
+ 79.00 4.5196E-02
+ 80.00 4.5387E-02
+ 81.00 4.5913E-02
+ 82.00 4.6637E-02
+ 83.00 4.7429E-02
+ 84.00 4.8173E-02
+ 85.00 4.8774E-02
+ 86.00 4.9153E-02
+ 87.00 4.9254E-02
+ 88.00 4.9035E-02
+ 89.00 4.8474E-02
+ 90.00 4.7562E-02
+ 91.00 4.6306E-02
+ 92.00 4.4724E-02
+ 93.00 4.2850E-02
+ 94.00 4.0726E-02
+ 95.00 3.8402E-02
+ 96.00 3.5934E-02
+ 97.00 3.3382E-02
+ 98.00 3.0803E-02
+ 99.00 2.8253E-02
+ 100.00 2.5780E-02
+ 101.00 2.3430E-02
+ 102.00 2.1240E-02
+ 103.00 1.9241E-02
+ 104.00 1.7454E-02
+ 105.00 1.5893E-02
+ 106.00 1.4565E-02
+ 107.00 1.3469E-02
+ 108.00 1.2595E-02
+ 109.00 1.1931E-02
+ 110.00 1.1458E-02
+ 111.00 1.1157E-02
+ 112.00 1.1003E-02
+ 113.00 1.0973E-02
+ 114.00 1.1040E-02
+ 115.00 1.1179E-02
+ 116.00 1.1365E-02
+ 117.00 1.1574E-02
+ 118.00 1.1785E-02
+ 119.00 1.1977E-02
+ 120.00 1.2137E-02
+ 121.00 1.2253E-02
+ 122.00 1.2316E-02
+ 123.00 1.2321E-02
+ 124.00 1.2265E-02
+ 125.00 1.2147E-02
+ 126.00 1.1968E-02
+ 127.00 1.1729E-02
+ 128.00 1.1436E-02
+ 129.00 1.1094E-02
+ 130.00 1.0711E-02
+ 131.00 1.0295E-02
+ 132.00 9.8568E-03
+ 133.00 9.4050E-03
+ 134.00 8.9484E-03
+ 135.00 8.4946E-03
+ 136.00 8.0503E-03
+ 137.00 7.6215E-03
+ 138.00 7.2132E-03
+ 139.00 6.8301E-03
+ 140.00 6.4764E-03
+ 141.00 6.1557E-03
+ 142.00 5.8708E-03
+ 143.00 5.6235E-03
+ 144.00 5.4145E-03
+ 145.00 5.2436E-03
+ 146.00 5.1096E-03
+ 147.00 5.0109E-03
+ 148.00 4.9455E-03
+ 149.00 4.9113E-03
+ 150.00 4.9062E-03
+ 151.00 4.9279E-03
+ 152.00 4.9741E-03
+ 153.00 5.0421E-03
+ 154.00 5.1293E-03
+ 155.00 5.2327E-03
+ 156.00 5.3496E-03
+ 157.00 5.4772E-03
+ 158.00 5.6132E-03
+ 159.00 5.7552E-03
+ 160.00 5.9014E-03
+ 161.00 6.0497E-03
+ 162.00 6.1984E-03
+ 163.00 6.3455E-03
+ 164.00 6.4894E-03
+ 165.00 6.6287E-03
+ 166.00 6.7622E-03
+ 167.00 6.8891E-03
+ 168.00 7.0088E-03
+ 169.00 7.1210E-03
+ 170.00 7.2252E-03
+ 171.00 7.3209E-03
+ 172.00 7.4075E-03
+ 173.00 7.4842E-03
+ 174.00 7.5504E-03
+ 175.00 7.6056E-03
+ 176.00 7.6498E-03
+ 177.00 7.6833E-03
+ 178.00 7.7065E-03
+ 179.00 7.7201E-03
diff --git a/Inputs/CrossSection/132Sndp_5A_MeV_2f7_ZR_FRC.lis b/Inputs/CrossSection/132Sndp_5A_MeV_2f7_ZR_FRC.lis
new file mode 100644
index 000000000..66b1787a9
--- /dev/null
+++ b/Inputs/CrossSection/132Sndp_5A_MeV_2f7_ZR_FRC.lis
@@ -0,0 +1,180 @@
+ 0.00 7.9396E-02
+ 1.00 7.9415E-02
+ 2.00 7.9475E-02
+ 3.00 7.9581E-02
+ 4.00 7.9747E-02
+ 5.00 7.9991E-02
+ 6.00 8.0337E-02
+ 7.00 8.0821E-02
+ 8.00 8.1489E-02
+ 9.00 8.2399E-02
+ 10.00 8.3625E-02
+ 11.00 8.5256E-02
+ 12.00 8.7401E-02
+ 13.00 9.0184E-02
+ 14.00 9.3746E-02
+ 15.00 9.8242E-02
+ 16.00 1.0384E-01
+ 17.00 1.1070E-01
+ 18.00 1.1899E-01
+ 19.00 1.2887E-01
+ 20.00 1.4046E-01
+ 21.00 1.5387E-01
+ 22.00 1.6916E-01
+ 23.00 1.8635E-01
+ 24.00 2.0541E-01
+ 25.00 2.2626E-01
+ 26.00 2.4875E-01
+ 27.00 2.7269E-01
+ 28.00 2.9782E-01
+ 29.00 3.2387E-01
+ 30.00 3.5050E-01
+ 31.00 3.7737E-01
+ 32.00 4.0410E-01
+ 33.00 4.3032E-01
+ 34.00 4.5568E-01
+ 35.00 4.7983E-01
+ 36.00 5.0246E-01
+ 37.00 5.2329E-01
+ 38.00 5.4208E-01
+ 39.00 5.5866E-01
+ 40.00 5.7287E-01
+ 41.00 5.8463E-01
+ 42.00 5.9391E-01
+ 43.00 6.0072E-01
+ 44.00 6.0510E-01
+ 45.00 6.0716E-01
+ 46.00 6.0703E-01
+ 47.00 6.0486E-01
+ 48.00 6.0083E-01
+ 49.00 5.9514E-01
+ 50.00 5.8800E-01
+ 51.00 5.7962E-01
+ 52.00 5.7022E-01
+ 53.00 5.6000E-01
+ 54.00 5.4917E-01
+ 55.00 5.3792E-01
+ 56.00 5.2642E-01
+ 57.00 5.1484E-01
+ 58.00 5.0333E-01
+ 59.00 4.9201E-01
+ 60.00 4.8101E-01
+ 61.00 4.7041E-01
+ 62.00 4.6029E-01
+ 63.00 4.5073E-01
+ 64.00 4.4176E-01
+ 65.00 4.3343E-01
+ 66.00 4.2574E-01
+ 67.00 4.1872E-01
+ 68.00 4.1235E-01
+ 69.00 4.0663E-01
+ 70.00 4.0153E-01
+ 71.00 3.9701E-01
+ 72.00 3.9304E-01
+ 73.00 3.8958E-01
+ 74.00 3.8658E-01
+ 75.00 3.8398E-01
+ 76.00 3.8173E-01
+ 77.00 3.7977E-01
+ 78.00 3.7805E-01
+ 79.00 3.7650E-01
+ 80.00 3.7507E-01
+ 81.00 3.7370E-01
+ 82.00 3.7233E-01
+ 83.00 3.7092E-01
+ 84.00 3.6941E-01
+ 85.00 3.6776E-01
+ 86.00 3.6592E-01
+ 87.00 3.6387E-01
+ 88.00 3.6156E-01
+ 89.00 3.5898E-01
+ 90.00 3.5610E-01
+ 91.00 3.5290E-01
+ 92.00 3.4938E-01
+ 93.00 3.4553E-01
+ 94.00 3.4135E-01
+ 95.00 3.3685E-01
+ 96.00 3.3204E-01
+ 97.00 3.2694E-01
+ 98.00 3.2157E-01
+ 99.00 3.1594E-01
+ 100.00 3.1010E-01
+ 101.00 3.0406E-01
+ 102.00 2.9786E-01
+ 103.00 2.9154E-01
+ 104.00 2.8513E-01
+ 105.00 2.7867E-01
+ 106.00 2.7219E-01
+ 107.00 2.6572E-01
+ 108.00 2.5932E-01
+ 109.00 2.5299E-01
+ 110.00 2.4679E-01
+ 111.00 2.4073E-01
+ 112.00 2.3485E-01
+ 113.00 2.2916E-01
+ 114.00 2.2370E-01
+ 115.00 2.1848E-01
+ 116.00 2.1351E-01
+ 117.00 2.0880E-01
+ 118.00 2.0437E-01
+ 119.00 2.0022E-01
+ 120.00 1.9636E-01
+ 121.00 1.9278E-01
+ 122.00 1.8948E-01
+ 123.00 1.8645E-01
+ 124.00 1.8369E-01
+ 125.00 1.8119E-01
+ 126.00 1.7894E-01
+ 127.00 1.7691E-01
+ 128.00 1.7511E-01
+ 129.00 1.7350E-01
+ 130.00 1.7209E-01
+ 131.00 1.7084E-01
+ 132.00 1.6974E-01
+ 133.00 1.6877E-01
+ 134.00 1.6793E-01
+ 135.00 1.6718E-01
+ 136.00 1.6651E-01
+ 137.00 1.6592E-01
+ 138.00 1.6538E-01
+ 139.00 1.6487E-01
+ 140.00 1.6439E-01
+ 141.00 1.6393E-01
+ 142.00 1.6347E-01
+ 143.00 1.6300E-01
+ 144.00 1.6253E-01
+ 145.00 1.6203E-01
+ 146.00 1.6150E-01
+ 147.00 1.6095E-01
+ 148.00 1.6036E-01
+ 149.00 1.5973E-01
+ 150.00 1.5907E-01
+ 151.00 1.5837E-01
+ 152.00 1.5764E-01
+ 153.00 1.5687E-01
+ 154.00 1.5607E-01
+ 155.00 1.5524E-01
+ 156.00 1.5438E-01
+ 157.00 1.5350E-01
+ 158.00 1.5260E-01
+ 159.00 1.5170E-01
+ 160.00 1.5078E-01
+ 161.00 1.4987E-01
+ 162.00 1.4896E-01
+ 163.00 1.4806E-01
+ 164.00 1.4717E-01
+ 165.00 1.4631E-01
+ 166.00 1.4547E-01
+ 167.00 1.4467E-01
+ 168.00 1.4390E-01
+ 169.00 1.4318E-01
+ 170.00 1.4250E-01
+ 171.00 1.4187E-01
+ 172.00 1.4130E-01
+ 173.00 1.4078E-01
+ 174.00 1.4033E-01
+ 175.00 1.3994E-01
+ 176.00 1.3962E-01
+ 177.00 1.3937E-01
+ 178.00 1.3919E-01
+ 179.00 1.3908E-01
diff --git a/Inputs/CrossSection/132Sndp_5A_MeV_3p3_ZR_FRC.lis b/Inputs/CrossSection/132Sndp_5A_MeV_3p3_ZR_FRC.lis
new file mode 100644
index 000000000..67be2eea7
--- /dev/null
+++ b/Inputs/CrossSection/132Sndp_5A_MeV_3p3_ZR_FRC.lis
@@ -0,0 +1,180 @@
+ 0.00 2.7754E-01
+ 1.00 2.7835E-01
+ 2.00 2.8077E-01
+ 3.00 2.8484E-01
+ 4.00 2.9057E-01
+ 5.00 2.9801E-01
+ 6.00 3.0720E-01
+ 7.00 3.1816E-01
+ 8.00 3.3091E-01
+ 9.00 3.4542E-01
+ 10.00 3.6166E-01
+ 11.00 3.7953E-01
+ 12.00 3.9889E-01
+ 13.00 4.1958E-01
+ 14.00 4.4134E-01
+ 15.00 4.6393E-01
+ 16.00 4.8701E-01
+ 17.00 5.1025E-01
+ 18.00 5.3330E-01
+ 19.00 5.5580E-01
+ 20.00 5.7741E-01
+ 21.00 5.9782E-01
+ 22.00 6.1680E-01
+ 23.00 6.3419E-01
+ 24.00 6.4991E-01
+ 25.00 6.6398E-01
+ 26.00 6.7651E-01
+ 27.00 6.8769E-01
+ 28.00 6.9777E-01
+ 29.00 7.0702E-01
+ 30.00 7.1572E-01
+ 31.00 7.2416E-01
+ 32.00 7.3257E-01
+ 33.00 7.4116E-01
+ 34.00 7.5012E-01
+ 35.00 7.5956E-01
+ 36.00 7.6959E-01
+ 37.00 7.8028E-01
+ 38.00 7.9167E-01
+ 39.00 8.0374E-01
+ 40.00 8.1648E-01
+ 41.00 8.2982E-01
+ 42.00 8.4365E-01
+ 43.00 8.5785E-01
+ 44.00 8.7226E-01
+ 45.00 8.8670E-01
+ 46.00 9.0100E-01
+ 47.00 9.1499E-01
+ 48.00 9.2850E-01
+ 49.00 9.4139E-01
+ 50.00 9.5353E-01
+ 51.00 9.6480E-01
+ 52.00 9.7510E-01
+ 53.00 9.8435E-01
+ 54.00 9.9247E-01
+ 55.00 9.9939E-01
+ 56.00 1.0050E+00
+ 57.00 1.0094E+00
+ 58.00 1.0123E+00
+ 59.00 1.0139E+00
+ 60.00 1.0140E+00
+ 61.00 1.0127E+00
+ 62.00 1.0100E+00
+ 63.00 1.0059E+00
+ 64.00 1.0004E+00
+ 65.00 9.9367E-01
+ 66.00 9.8565E-01
+ 67.00 9.7645E-01
+ 68.00 9.6613E-01
+ 69.00 9.5476E-01
+ 70.00 9.4242E-01
+ 71.00 9.2918E-01
+ 72.00 9.1512E-01
+ 73.00 9.0030E-01
+ 74.00 8.8481E-01
+ 75.00 8.6873E-01
+ 76.00 8.5213E-01
+ 77.00 8.3510E-01
+ 78.00 8.1773E-01
+ 79.00 8.0011E-01
+ 80.00 7.8231E-01
+ 81.00 7.6444E-01
+ 82.00 7.4658E-01
+ 83.00 7.2880E-01
+ 84.00 7.1120E-01
+ 85.00 6.9384E-01
+ 86.00 6.7680E-01
+ 87.00 6.6014E-01
+ 88.00 6.4392E-01
+ 89.00 6.2818E-01
+ 90.00 6.1297E-01
+ 91.00 5.9833E-01
+ 92.00 5.8428E-01
+ 93.00 5.7085E-01
+ 94.00 5.5804E-01
+ 95.00 5.4586E-01
+ 96.00 5.3433E-01
+ 97.00 5.2342E-01
+ 98.00 5.1314E-01
+ 99.00 5.0347E-01
+ 100.00 4.9439E-01
+ 101.00 4.8588E-01
+ 102.00 4.7792E-01
+ 103.00 4.7046E-01
+ 104.00 4.6350E-01
+ 105.00 4.5698E-01
+ 106.00 4.5088E-01
+ 107.00 4.4516E-01
+ 108.00 4.3979E-01
+ 109.00 4.3473E-01
+ 110.00 4.2994E-01
+ 111.00 4.2539E-01
+ 112.00 4.2105E-01
+ 113.00 4.1688E-01
+ 114.00 4.1285E-01
+ 115.00 4.0894E-01
+ 116.00 4.0511E-01
+ 117.00 4.0134E-01
+ 118.00 3.9762E-01
+ 119.00 3.9391E-01
+ 120.00 3.9020E-01
+ 121.00 3.8648E-01
+ 122.00 3.8273E-01
+ 123.00 3.7895E-01
+ 124.00 3.7512E-01
+ 125.00 3.7124E-01
+ 126.00 3.6732E-01
+ 127.00 3.6334E-01
+ 128.00 3.5931E-01
+ 129.00 3.5523E-01
+ 130.00 3.5111E-01
+ 131.00 3.4695E-01
+ 132.00 3.4276E-01
+ 133.00 3.3854E-01
+ 134.00 3.3431E-01
+ 135.00 3.3007E-01
+ 136.00 3.2584E-01
+ 137.00 3.2161E-01
+ 138.00 3.1741E-01
+ 139.00 3.1324E-01
+ 140.00 3.0911E-01
+ 141.00 3.0503E-01
+ 142.00 3.0100E-01
+ 143.00 2.9705E-01
+ 144.00 2.9317E-01
+ 145.00 2.8937E-01
+ 146.00 2.8566E-01
+ 147.00 2.8205E-01
+ 148.00 2.7854E-01
+ 149.00 2.7513E-01
+ 150.00 2.7184E-01
+ 151.00 2.6865E-01
+ 152.00 2.6559E-01
+ 153.00 2.6264E-01
+ 154.00 2.5982E-01
+ 155.00 2.5711E-01
+ 156.00 2.5453E-01
+ 157.00 2.5207E-01
+ 158.00 2.4974E-01
+ 159.00 2.4753E-01
+ 160.00 2.4544E-01
+ 161.00 2.4347E-01
+ 162.00 2.4161E-01
+ 163.00 2.3988E-01
+ 164.00 2.3826E-01
+ 165.00 2.3675E-01
+ 166.00 2.3536E-01
+ 167.00 2.3407E-01
+ 168.00 2.3289E-01
+ 169.00 2.3181E-01
+ 170.00 2.3083E-01
+ 171.00 2.2996E-01
+ 172.00 2.2918E-01
+ 173.00 2.2850E-01
+ 174.00 2.2791E-01
+ 175.00 2.2742E-01
+ 176.00 2.2702E-01
+ 177.00 2.2671E-01
+ 178.00 2.2648E-01
+ 179.00 2.2635E-01
diff --git a/Inputs/CrossSection/CS_Ep10MeV_sn134pt_gs_1h9demi.dat b/Inputs/CrossSection/CS_Ep10MeV_sn134pt_gs_1h9demi.dat
new file mode 100644
index 000000000..8525bb649
--- /dev/null
+++ b/Inputs/CrossSection/CS_Ep10MeV_sn134pt_gs_1h9demi.dat
@@ -0,0 +1,90 @@
+ 0.00 0.16569E-06
+ 2.00 0.16942E-06
+ 4.00 0.18063E-06
+ 6.00 0.19928E-06
+ 8.00 0.22517E-06
+ 10.00 0.25765E-06
+ 12.00 0.29547E-06
+ 14.00 0.33661E-06
+ 16.00 0.37833E-06
+ 18.00 0.41727E-06
+ 20.00 0.44978E-06
+ 22.00 0.47231E-06
+ 24.00 0.48189E-06
+ 26.00 0.47646E-06
+ 28.00 0.45530E-06
+ 30.00 0.41908E-06
+ 32.00 0.36999E-06
+ 34.00 0.31146E-06
+ 36.00 0.24791E-06
+ 38.00 0.18432E-06
+ 40.00 0.12569E-06
+ 42.00 0.76637E-07
+ 44.00 0.40899E-07
+ 46.00 0.21007E-07
+ 48.00 0.18072E-07
+ 50.00 0.31701E-07
+ 52.00 0.60080E-07
+ 54.00 0.10018E-06
+ 56.00 0.14810E-06
+ 58.00 0.19942E-06
+ 60.00 0.24972E-06
+ 62.00 0.29489E-06
+ 64.00 0.33156E-06
+ 66.00 0.35735E-06
+ 68.00 0.37099E-06
+ 70.00 0.37239E-06
+ 72.00 0.36249E-06
+ 74.00 0.34313E-06
+ 76.00 0.31677E-06
+ 78.00 0.28621E-06
+ 80.00 0.25427E-06
+ 82.00 0.22360E-06
+ 84.00 0.19639E-06
+ 86.00 0.17431E-06
+ 88.00 0.15835E-06
+ 90.00 0.14892E-06
+ 92.00 0.14581E-06
+ 94.00 0.14834E-06
+ 96.00 0.15548E-06
+ 98.00 0.16599E-06
+ 100.00 0.17853E-06
+ 102.00 0.19180E-06
+ 104.00 0.20464E-06
+ 106.00 0.21608E-06
+ 108.00 0.22541E-06
+ 110.00 0.23215E-06
+ 112.00 0.23609E-06
+ 114.00 0.23723E-06
+ 116.00 0.23576E-06
+ 118.00 0.23202E-06
+ 120.00 0.22642E-06
+ 122.00 0.21944E-06
+ 124.00 0.21156E-06
+ 126.00 0.20325E-06
+ 128.00 0.19492E-06
+ 130.00 0.18692E-06
+ 132.00 0.17954E-06
+ 134.00 0.17299E-06
+ 136.00 0.16740E-06
+ 138.00 0.16285E-06
+ 140.00 0.15935E-06
+ 142.00 0.15687E-06
+ 144.00 0.15536E-06
+ 146.00 0.15472E-06
+ 148.00 0.15483E-06
+ 150.00 0.15559E-06
+ 152.00 0.15687E-06
+ 154.00 0.15855E-06
+ 156.00 0.16052E-06
+ 158.00 0.16267E-06
+ 160.00 0.16491E-06
+ 162.00 0.16716E-06
+ 164.00 0.16934E-06
+ 166.00 0.17138E-06
+ 168.00 0.17325E-06
+ 170.00 0.17489E-06
+ 172.00 0.17628E-06
+ 174.00 0.17738E-06
+ 176.00 0.17818E-06
+ 178.00 0.17867E-06
diff --git a/Inputs/CrossSection/CS_Ep15MeV_sn134pt_gs_1h9demi.dat b/Inputs/CrossSection/CS_Ep15MeV_sn134pt_gs_1h9demi.dat
new file mode 100644
index 000000000..a49524dc7
--- /dev/null
+++ b/Inputs/CrossSection/CS_Ep15MeV_sn134pt_gs_1h9demi.dat
@@ -0,0 +1,90 @@
+ 0.00 0.74986E-06
+ 2.00 0.72457E-06
+ 4.00 0.65371E-06
+ 6.00 0.55132E-06
+ 8.00 0.43767E-06
+ 10.00 0.33534E-06
+ 12.00 0.26506E-06
+ 14.00 0.24199E-06
+ 16.00 0.27332E-06
+ 18.00 0.35716E-06
+ 20.00 0.48312E-06
+ 22.00 0.63395E-06
+ 24.00 0.78829E-06
+ 26.00 0.92376E-06
+ 28.00 0.10203E-05
+ 30.00 0.10631E-05
+ 32.00 0.10449E-05
+ 34.00 0.96677E-06
+ 36.00 0.83837E-06
+ 38.00 0.67611E-06
+ 40.00 0.50059E-06
+ 42.00 0.33336E-06
+ 44.00 0.19355E-06
+ 46.00 0.95102E-07
+ 48.00 0.44996E-07
+ 50.00 0.42738E-07
+ 52.00 0.81134E-07
+ 54.00 0.14805E-06
+ 56.00 0.22881E-06
+ 58.00 0.30865E-06
+ 60.00 0.37494E-06
+ 62.00 0.41876E-06
+ 64.00 0.43567E-06
+ 66.00 0.42567E-06
+ 68.00 0.39261E-06
+ 70.00 0.34296E-06
+ 72.00 0.28456E-06
+ 74.00 0.22530E-06
+ 76.00 0.17196E-06
+ 78.00 0.12955E-06
+ 80.00 0.10083E-06
+ 82.00 0.86394E-07
+ 84.00 0.84918E-07
+ 86.00 0.93674E-07
+ 88.00 0.10914E-06
+ 90.00 0.12757E-06
+ 92.00 0.14556E-06
+ 94.00 0.16034E-06
+ 96.00 0.17009E-06
+ 98.00 0.17389E-06
+ 100.00 0.17174E-06
+ 102.00 0.16432E-06
+ 104.00 0.15283E-06
+ 106.00 0.13871E-06
+ 108.00 0.12345E-06
+ 110.00 0.10841E-06
+ 112.00 0.94699E-07
+ 114.00 0.83117E-07
+ 116.00 0.74118E-07
+ 118.00 0.67843E-07
+ 120.00 0.64166E-07
+ 122.00 0.62763E-07
+ 124.00 0.63175E-07
+ 126.00 0.64884E-07
+ 128.00 0.67365E-07
+ 130.00 0.70138E-07
+ 132.00 0.72798E-07
+ 134.00 0.75033E-07
+ 136.00 0.76634E-07
+ 138.00 0.77491E-07
+ 140.00 0.77577E-07
+ 142.00 0.76937E-07
+ 144.00 0.75666E-07
+ 146.00 0.73887E-07
+ 148.00 0.71735E-07
+ 150.00 0.69340E-07
+ 152.00 0.66816E-07
+ 154.00 0.64254E-07
+ 156.00 0.61722E-07
+ 158.00 0.59262E-07
+ 160.00 0.56902E-07
+ 162.00 0.54656E-07
+ 164.00 0.52535E-07
+ 166.00 0.50553E-07
+ 168.00 0.48728E-07
+ 170.00 0.47089E-07
+ 172.00 0.45670E-07
+ 174.00 0.44511E-07
+ 176.00 0.43650E-07
+ 178.00 0.43119E-07
diff --git a/Inputs/CrossSection/CS_Ep20MeV_sn134pt_gs_1h9demi.dat b/Inputs/CrossSection/CS_Ep20MeV_sn134pt_gs_1h9demi.dat
new file mode 100644
index 000000000..8766e1fe9
--- /dev/null
+++ b/Inputs/CrossSection/CS_Ep20MeV_sn134pt_gs_1h9demi.dat
@@ -0,0 +1,90 @@
+ 0.00 0.32271E-05
+ 2.00 0.31495E-05
+ 4.00 0.29259E-05
+ 6.00 0.25828E-05
+ 8.00 0.21597E-05
+ 10.00 0.17028E-05
+ 12.00 0.12592E-05
+ 14.00 0.87079E-06
+ 16.00 0.56980E-06
+ 18.00 0.37542E-06
+ 20.00 0.29185E-06
+ 22.00 0.30811E-06
+ 24.00 0.39985E-06
+ 26.00 0.53346E-06
+ 28.00 0.67184E-06
+ 30.00 0.78100E-06
+ 32.00 0.83609E-06
+ 34.00 0.82530E-06
+ 36.00 0.75101E-06
+ 38.00 0.62785E-06
+ 40.00 0.47846E-06
+ 42.00 0.32808E-06
+ 44.00 0.19927E-06
+ 46.00 0.10786E-06
+ 48.00 0.60824E-07
+ 50.00 0.56181E-07
+ 52.00 0.84677E-07
+ 54.00 0.13263E-06
+ 56.00 0.18522E-06
+ 58.00 0.22945E-06
+ 60.00 0.25634E-06
+ 62.00 0.26191E-06
+ 64.00 0.24710E-06
+ 66.00 0.21667E-06
+ 68.00 0.17755E-06
+ 70.00 0.13712E-06
+ 72.00 0.10164E-06
+ 74.00 0.75298E-07
+ 76.00 0.59816E-07
+ 78.00 0.54627E-07
+ 80.00 0.57467E-07
+ 82.00 0.65166E-07
+ 84.00 0.74426E-07
+ 86.00 0.82450E-07
+ 88.00 0.87327E-07
+ 90.00 0.88163E-07
+ 92.00 0.84998E-07
+ 94.00 0.78573E-07
+ 96.00 0.70036E-07
+ 98.00 0.60642E-07
+ 100.00 0.51524E-07
+ 102.00 0.43529E-07
+ 104.00 0.37160E-07
+ 106.00 0.32574E-07
+ 108.00 0.29655E-07
+ 110.00 0.28097E-07
+ 112.00 0.27507E-07
+ 114.00 0.27486E-07
+ 116.00 0.27687E-07
+ 118.00 0.27854E-07
+ 120.00 0.27826E-07
+ 122.00 0.27528E-07
+ 124.00 0.26951E-07
+ 126.00 0.26122E-07
+ 128.00 0.25090E-07
+ 130.00 0.23902E-07
+ 132.00 0.22601E-07
+ 134.00 0.21225E-07
+ 136.00 0.19809E-07
+ 138.00 0.18389E-07
+ 140.00 0.17013E-07
+ 142.00 0.15735E-07
+ 144.00 0.14618E-07
+ 146.00 0.13719E-07
+ 148.00 0.13087E-07
+ 150.00 0.12743E-07
+ 152.00 0.12683E-07
+ 154.00 0.12864E-07
+ 156.00 0.13213E-07
+ 158.00 0.13633E-07
+ 160.00 0.14018E-07
+ 162.00 0.14267E-07
+ 164.00 0.14306E-07
+ 166.00 0.14095E-07
+ 168.00 0.13638E-07
+ 170.00 0.12986E-07
+ 172.00 0.12225E-07
+ 174.00 0.11465E-07
+ 176.00 0.10819E-07
+ 178.00 0.10386E-07
diff --git a/Inputs/DetectorConfiguration/gaspardTestSpheric.detector b/Inputs/DetectorConfiguration/gaspardTestSpheric.detector
index 91d535366..8b10e2ead 100644
--- a/Inputs/DetectorConfiguration/gaspardTestSpheric.detector
+++ b/Inputs/DetectorConfiguration/gaspardTestSpheric.detector
@@ -1,4 +1,3 @@
-%Fichier de configuration manip E225
%%%%%%%%%%%Target%%%%%%%%%%%%%%%%%%%1
%Thickness in micrometer
%Radius in mm
@@ -9,7 +8,7 @@
GeneralTarget
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Target
- THICKNESS= 10.3
+ THICKNESS= 0.00001
ANGLE= 0
RADIUS= 12
MATERIAL= CD2
@@ -17,6 +16,8 @@ Target
X= 0
Y= 0
Z= 0
+
+
%%%%%%%%%%Detector%%%%%%%%%%%%%%%%%%%
%%Position and R given in mm
%%Angle given in degree
diff --git a/Inputs/EventGenerator/132Sndp.reaction b/Inputs/EventGenerator/132Sndp.reaction
index fd8854164..9614773cb 100644
--- a/Inputs/EventGenerator/132Sndp.reaction
+++ b/Inputs/EventGenerator/132Sndp.reaction
@@ -14,7 +14,7 @@ Transfert
SigmaY= 0
SigmaThetaX= 0
SigmaPhiY= 0
- CrossSectionPath= sn132dp_gs_10AMeV.txt
+ CrossSectionPath= 132Sndp_10A_MeV_3p3_ZR_FRC.lis
ShootLight= 1
ShootHeavy= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/NPAnalysis/Gaspard/RunToTreat.txt b/NPAnalysis/Gaspard/RunToTreat.txt
index 5e6a33893..ec41825c3 100644
--- a/NPAnalysis/Gaspard/RunToTreat.txt
+++ b/NPAnalysis/Gaspard/RunToTreat.txt
@@ -1,5 +1,6 @@
TTreeName
SimulatedTree
RootFileName
- ../../Outputs/Simulation/mySimul.root
-% ../../Outputs/Simulation/sn132dp_10MeVA_T1_B0_E0.root
+% ../../Outputs/Simulation/mySimul.root
+ ../../Outputs/Simulation/132Sndp_3p3_10MeVA_T0_B1_E0_S05mm.root
+% ../../Outputs/Simulation/134Snpt_1h9_10MeVA_T1_B1_E0_S05mm.root
diff --git a/NPAnalysis/Gaspard/include/ObjectManager.hh b/NPAnalysis/Gaspard/include/ObjectManager.hh
index c9c31cab2..a4ec95b93 100644
--- a/NPAnalysis/Gaspard/include/ObjectManager.hh
+++ b/NPAnalysis/Gaspard/include/ObjectManager.hh
@@ -32,6 +32,7 @@
#include "RootInput.h"
#include "RootOutput.h"
#include "TInteractionCoordinates.h"
+#include "TInitialConditions.h"
// Use CLHEP System of unit and Physical Constant
#include "CLHEP/Units/GlobalSystemOfUnits.h"
@@ -105,8 +106,12 @@ namespace ENERGYLOSS
{
// Declare your Energy loss here
// EnergyLoss LightTargetCD2 = EnergyLoss("proton_cd2.txt", 100, 1, 1); // LISE++
+ // For 132Sn(d,p)
EnergyLoss LightTarget = EnergyLoss("proton_CD2.G4table", "G4Table", 1000); // G4
EnergyLoss BeamTarget = EnergyLoss("Sn132[0.0]_CD2.G4table", "G4Table", 1000); // G4
+ // For 132Sn(d,p)
+// EnergyLoss LightTarget = EnergyLoss("triton_CH2.G4table", "G4Table", 1000); // G4
+// EnergyLoss BeamTarget = EnergyLoss("Sn134[0.0]_CH2.G4table", "G4Table", 1000); // G4
}
using namespace ENERGYLOSS ;
diff --git a/NPAnalysis/Gaspard/src/Analysis.cc b/NPAnalysis/Gaspard/src/Analysis.cc
index b107a6fb0..d88e08b9c 100644
--- a/NPAnalysis/Gaspard/src/Analysis.cc
+++ b/NPAnalysis/Gaspard/src/Analysis.cc
@@ -30,13 +30,14 @@ int main(int argc,char** argv)
NPA::DetectorManager* myDetector = new DetectorManager;
myDetector->ReadConfigurationFile(detectorfileName);
- // nominal beam energy
+ // Calculate beam energy at target middle
+ // Get nominal beam energy
Double_t BeamEnergyNominal = myReaction->GetBeamEnergy() * MeV;
cout << BeamEnergyNominal << endl;
- // slow beam at target middle
+ // Slow beam at target middle
Double_t BeamEnergy = BeamEnergyNominal - BeamTarget.Slow(BeamEnergyNominal, myDetector->GetTargetThickness()/2 * micrometer, 0);
cout << BeamEnergy << endl;
- // set energy beam at target middle
+ // Set energy beam at target middle
myReaction->SetBeamEnergy(BeamEnergy);
// Print target thickness
@@ -54,9 +55,14 @@ int main(int argc,char** argv)
// Get GaspardTracker pointer
GaspardTracker* GPDTrack = (GaspardTracker*) myDetector->m_Detector["GASPARD"];
- // Get the TChain and treat it
+ // Get the input TChain and treat it
TChain* chain = RootInput:: getInstance() -> GetChain();
+ // Connect TInitialConditions branch
+ TInitialConditions *initCond = 0;
+ chain->SetBranchAddress("InitialConditions", &initCond);
+ chain->SetBranchStatus("InitialConditions", 1);
+
// Connect TInteractionCoordinates branch
TInteractionCoordinates *interCoord = 0;
chain->SetBranchAddress("InteractionCoordinates", &interCoord);
@@ -66,6 +72,13 @@ int main(int argc,char** argv)
int nentries = chain->GetEntries();
cout << "Number of entries to be analysed: " << nentries << endl;
+ // Default initialization
+ double XTarget = 0;
+ double YTarget = 0;
+ double BeamTheta = 0;
+ double BeamPhi = 0;
+
+ // Loop on all events
for (int i = 0; i < nentries; i ++) {
if (i%10000 == 0 && i!=0) cout << "\r" << i << " analyzed events" << flush;
chain -> GetEntry(i);
@@ -79,21 +92,47 @@ int main(int argc,char** argv)
// if there is a hit in the detector array, treat it.
double Theta, ThetaStrip;
+ double DetecX, DetecY, DetecZ;
TVector3 A;
if (E > -1000) {
// Get exact scattering angle from TInteractionCoordinates object
- Theta = interCoord->GetDetectedAngleTheta(0) * deg;
-
- // Get interaction coordinates taking into account the strips
+// Theta = interCoord->GetDetectedAngleTheta(0) * deg;
+ DetecX = interCoord->GetDetectedPositionX(0);
+ DetecY = interCoord->GetDetectedPositionY(0);
+ DetecZ = interCoord->GetDetectedPositionZ(0);
+ TVector3 Detec(DetecX, DetecY, DetecZ);
+
+ // Get interaction position in detector
+ // This takes into account the strips
A = GPDTrack->GetPositionOfInteraction();
- // Calculate scattering angle
- ThetaStrip = ThetaCalculation (A ,TVector3(0,0,1));
+
+ // Get beam interaction coordinates on target (from initial condition)
+ XTarget = initCond->GetICPositionX(0);
+ YTarget = initCond->GetICPositionY(0);
+// cout << XTarget << " " << YTarget << endl;
+ BeamTheta = initCond->GetICIncidentAngleTheta(0)*deg;
+ BeamPhi = initCond->GetICIncidentAnglePhi(0)*deg;
+ TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta), sin(BeamPhi)*sin(BeamTheta), cos(BeamTheta));
+// cout << BeamDirection.X() << " " << BeamDirection.Y() << " " << BeamDirection.Z() << endl;
+
+ // Hit direction taking into account beam position on target
+ TVector3 HitDirection = A - TVector3(XTarget, YTarget, 0);
+// cout << "A: " << A.X() << " " << A.Y() << " " << A.Z() << endl;
+// cout << "HitDirection: " << HitDirection.X() << " " << HitDirection.Y() << " " << HitDirection.Z() << endl;
+
+ // Calculate scattering angle w.r.t. optical beam axis (do not take into account beam position on target)
+// ThetaStrip = ThetaCalculation(A, TVector3(0,0,1));
+// Theta = ThetaCalculation(Detec, TVector3(0, 0, 1));
+ // Calculate scattering angle w.r.t. beam
+ ThetaStrip = ThetaCalculation(HitDirection, BeamDirection);
+ Theta = ThetaCalculation(Detec - TVector3(XTarget, YTarget, 0), BeamDirection);
// Correct for energy loss in the target
-// E = LightTarget.EvaluateInitialEnergy(E, 5.15*micrometer, ThetaStrip);
E = LightTarget.EvaluateInitialEnergy(E, myDetector->GetTargetThickness()/2 * micrometer, ThetaStrip);
// Calculate excitation energy
+// if (Theta/deg > 35 && Theta/deg < 85) {
+// if (Theta/deg < 85) {
if (Theta/deg > 90) {
ExNoStrips = myReaction->ReconstructRelativistic(E, Theta / rad);
Ex = myReaction->ReconstructRelativistic(E, ThetaStrip);
diff --git a/NPLib/GASPARD/GaspardTracker.cxx b/NPLib/GASPARD/GaspardTracker.cxx
index ee430b6cd..7c8aa36eb 100644
--- a/NPLib/GASPARD/GaspardTracker.cxx
+++ b/NPLib/GASPARD/GaspardTracker.cxx
@@ -802,7 +802,7 @@ void GaspardTracker::AddModuleDummyShape(double theta,
V.Rotate( beta_w * Pi/180. , W ) ;
double Face = 50; // mm
- double NumberOfStrip = 25;
+ double NumberOfStrip = 100;
double StripPitch = Face/NumberOfStrip; // mm
vector<double> lineX;
diff --git a/NPSimulation/include/GaspardTrackerDummyShape.hh b/NPSimulation/include/GaspardTrackerDummyShape.hh
index 79e282b2e..aafc1c505 100644
--- a/NPSimulation/include/GaspardTrackerDummyShape.hh
+++ b/NPSimulation/include/GaspardTrackerDummyShape.hh
@@ -143,15 +143,15 @@ namespace GPDDUMMYSHAPE
// Resolution
// const G4double ResoFirstStage = 0; // = 50 keV of Resolution // Unit is MeV/2.35
const G4double ResoFirstStage = 0.0213; // = 50 keV of Resolution // Unit is MeV/2.35
- const G4double ResoSecondStage = 0.0213; // = 50 keV of resolution // Unit is MeV/2.35
- const G4double ResoThirdStage = 0.0213; // = 50 keV of resolution // Unit is MeV/2.35
+ const G4double ResoSecondStage = 0.0426; // = 100 keV of resolution // Unit is MeV/2.35
+ const G4double ResoThirdStage = 0.0426; // = 100 keV of resolution // Unit is MeV/2.35
const G4double ResoTimeGpd = 0.212765957;// = 500ps // Unit is ns/2.35
// Geometry for the mother volume containing the different layers of your dummy shape module
const G4double FaceFront = 5.1*cm;
const G4double FaceBack = 5.1*cm;
const G4double Length = 1.5*cm;
- const G4double InterStageDistance = 5*mm;
+ const G4double InterStageDistance = 7*mm;
// for testing the excitation energy reconstruction
// const G4double Length = 4*cm;
// const G4double InterStageDistance = 15*mm;
@@ -162,15 +162,19 @@ namespace GPDDUMMYSHAPE
// const G4double FirstStageThickness = 2*mm;
// for testing the excitation energy reconstruction
// const G4double FirstStageThickness = 1.3*cm;
- const G4int NumberOfStrips = 25; // 2mm strip pitch
+// const G4int NumberOfStrips = 10; // 5 mm strip pitch
+// const G4int NumberOfStrips = 25; // 2 mm strip pitch
+// const G4int NumberOfStrips = 50; // 1 mm strip pitch
+ const G4int NumberOfStrips = 100; // 0.5 mm strip pitch
+// const G4int NumberOfStrips = 500; // 0.1 mm strip pitch
// Second stage
const G4double SecondStageFace = FirstStageFace;
- const G4double SecondStageThickness = 1*mm;
+ const G4double SecondStageThickness = 1.5*mm;
// Third stage
const G4double ThirdStageFace = FirstStageFace;
- const G4double ThirdStageThickness = 1*mm;
+ const G4double ThirdStageThickness = 1.5*mm;
// Starting at the front of the first stage and going to the third stage
const G4double FirstStage_PosZ = Length* -0.5 + 0.5*FirstStageThickness;
diff --git a/NPSimulation/src/EventGeneratorTransfert.cc b/NPSimulation/src/EventGeneratorTransfert.cc
index e30585f7f..98cf44b25 100644
--- a/NPSimulation/src/EventGeneratorTransfert.cc
+++ b/NPSimulation/src/EventGeneratorTransfert.cc
@@ -328,26 +328,20 @@ while(ReadingStatus){
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void EventGeneratorTransfert::GenerateEvent(G4Event* anEvent , G4ParticleGun* particleGun)
{
- // If first time, write the DeDx table
- if(anEvent->GetEventID()==0)
- {
- //-------------- Before living, wrtie the DeDx Table -------------------
-
- G4int LightZx = m_Reaction->GetNucleus3()->GetZ() ;
- G4int LightAx = m_Reaction->GetNucleus3()->GetA() ;
-
- G4int BeamZx = m_Reaction->GetNucleus1()->GetZ() ;
- G4int BeamAx = m_Reaction->GetNucleus1()->GetA() ;
-
- if(m_Target!=0)
- {
- m_Target->WriteDEDXTable(G4ParticleTable::GetParticleTable()->GetIon(LightZx,LightAx, 0.) ,0, m_BeamEnergy+4*m_BeamEnergySpread);
- m_Target->WriteDEDXTable(G4ParticleTable::GetParticleTable()->GetIon(BeamZx,BeamAx, 0.) ,0, m_BeamEnergy+4*m_BeamEnergySpread);
- }
-
- }
-
-
+ // If first time, write the DeDx table
+ if (anEvent->GetEventID() == 0) {
+ //-------------- Before living, wrtie the DeDx Table -------------------
+ G4int LightZx = m_Reaction->GetNucleus3()->GetZ();
+ G4int LightAx = m_Reaction->GetNucleus3()->GetA();
+
+ G4int BeamZx = m_Reaction->GetNucleus1()->GetZ();
+ G4int BeamAx = m_Reaction->GetNucleus1()->GetA();
+
+ if (m_Target != 0) {
+ m_Target->WriteDEDXTable(G4ParticleTable::GetParticleTable()->GetIon(LightZx,LightAx, 0.) ,0, m_BeamEnergy+4*m_BeamEnergySpread);
+ m_Target->WriteDEDXTable(G4ParticleTable::GetParticleTable()->GetIon(BeamZx,BeamAx, 0.) ,0, m_BeamEnergy+4*m_BeamEnergySpread);
+ }
+ }
// Clear contents of Precedent event (now stored in ROOTOutput)
m_InitConditions->Clear();
diff --git a/NPSimulation/src/Target.cc b/NPSimulation/src/Target.cc
index baa661c43..4537ef5d8 100644
--- a/NPSimulation/src/Target.cc
+++ b/NPSimulation/src/Target.cc
@@ -165,7 +165,7 @@ G4Material* Target::GetMaterialFromLibrary(G4String MaterialName, G4double Tempe
G4Element* C = new G4Element("Carbon" , "C" , 6. , 12.011*g / mole);
G4Element* D = new G4Element("Deuteron" , "D" , 1., 2.0141*g / mole);
- G4Material* myMaterial = new G4Material("CD2", 0.97*g / cm3, 2);
+ G4Material* myMaterial = new G4Material("CD2", 1.15*g / cm3, 2);
myMaterial->AddElement(C , 1);
myMaterial->AddElement(D , 2);
return myMaterial;
@@ -175,7 +175,7 @@ G4Material* Target::GetMaterialFromLibrary(G4String MaterialName, G4double Tempe
G4Element* C = new G4Element("Carbon" , "C" , 6. , 12.011*g / mole);
G4Element* H = new G4Element("Hydrogen", "H" , 1. , 1.01 *g / mole);
- G4Material* myMaterial = new G4Material("CH2", 0.9*g / cm3, 2);
+ G4Material* myMaterial = new G4Material("CH2", 1.0*g / cm3, 2);
myMaterial->AddElement(C , 1);
myMaterial->AddElement(H , 2);
return myMaterial;
--
GitLab