From 35f4614ee6580bd1e837c3621bcd3a47718da364 Mon Sep 17 00:00:00 2001
From: deserevi <deserevi@nptool>
Date: Thu, 23 Dec 2010 19:54:09 +0000
Subject: [PATCH] * Add cross-section file for 132Sn(d,p) @ 10 MeV/u and Ex =
10 MeV + D. Beaumel physics case (Pygmee Dipole Resonance)
* Remove useless detector declarations in gaspHyde.detector file
* Add NPOptionManager->Destroy in Simulation.cc
---
Inputs/CrossSection/Sn131dp-pdr.xsec | 180 ++++++++++++++++++
.../DetectorConfiguration/gaspHyde.detector | 72 +------
NPSimulation/Simulation.cc | 1 +
3 files changed, 182 insertions(+), 71 deletions(-)
create mode 100644 Inputs/CrossSection/Sn131dp-pdr.xsec
diff --git a/Inputs/CrossSection/Sn131dp-pdr.xsec b/Inputs/CrossSection/Sn131dp-pdr.xsec
new file mode 100644
index 000000000..1f7416f84
--- /dev/null
+++ b/Inputs/CrossSection/Sn131dp-pdr.xsec
@@ -0,0 +1,180 @@
+ 0.00 0.28993E-01
+ 1.00 0.28858E-01
+ 2.00 0.28456E-01
+ 3.00 0.27795E-01
+ 4.00 0.26889E-01
+ 5.00 0.25756E-01
+ 6.00 0.24419E-01
+ 7.00 0.22908E-01
+ 8.00 0.21257E-01
+ 9.00 0.19504E-01
+ 10.00 0.17696E-01
+ 11.00 0.15880E-01
+ 12.00 0.14111E-01
+ 13.00 0.12441E-01
+ 14.00 0.10926E-01
+ 15.00 0.96126E-02
+ 16.00 0.85456E-02
+ 17.00 0.77587E-02
+ 18.00 0.72757E-02
+ 19.00 0.71083E-02
+ 20.00 0.72565E-02
+ 21.00 0.77077E-02
+ 22.00 0.84383E-02
+ 23.00 0.94151E-02
+ 24.00 0.10597E-01
+ 25.00 0.11937E-01
+ 26.00 0.13387E-01
+ 27.00 0.14896E-01
+ 28.00 0.16414E-01
+ 29.00 0.17893E-01
+ 30.00 0.19289E-01
+ 31.00 0.20562E-01
+ 32.00 0.21677E-01
+ 33.00 0.22605E-01
+ 34.00 0.23326E-01
+ 35.00 0.23828E-01
+ 36.00 0.24105E-01
+ 37.00 0.24160E-01
+ 38.00 0.24001E-01
+ 39.00 0.23642E-01
+ 40.00 0.23099E-01
+ 41.00 0.22390E-01
+ 42.00 0.21537E-01
+ 43.00 0.20561E-01
+ 44.00 0.19486E-01
+ 45.00 0.18338E-01
+ 46.00 0.17140E-01
+ 47.00 0.15916E-01
+ 48.00 0.14690E-01
+ 49.00 0.13482E-01
+ 50.00 0.12310E-01
+ 51.00 0.11190E-01
+ 52.00 0.10138E-01
+ 53.00 0.91655E-02
+ 54.00 0.82834E-02
+ 55.00 0.75003E-02
+ 56.00 0.68225E-02
+ 57.00 0.62535E-02
+ 58.00 0.57942E-02
+ 59.00 0.54426E-02
+ 60.00 0.51944E-02
+ 61.00 0.50431E-02
+ 62.00 0.49805E-02
+ 63.00 0.49972E-02
+ 64.00 0.50822E-02
+ 65.00 0.52242E-02
+ 66.00 0.54106E-02
+ 67.00 0.56287E-02
+ 68.00 0.58658E-02
+ 69.00 0.61093E-02
+ 70.00 0.63474E-02
+ 71.00 0.65694E-02
+ 72.00 0.67658E-02
+ 73.00 0.69288E-02
+ 74.00 0.70519E-02
+ 75.00 0.71303E-02
+ 76.00 0.71607E-02
+ 77.00 0.71414E-02
+ 78.00 0.70723E-02
+ 79.00 0.69547E-02
+ 80.00 0.67913E-02
+ 81.00 0.65861E-02
+ 82.00 0.63438E-02
+ 83.00 0.60701E-02
+ 84.00 0.57712E-02
+ 85.00 0.54534E-02
+ 86.00 0.51233E-02
+ 87.00 0.47874E-02
+ 88.00 0.44521E-02
+ 89.00 0.41233E-02
+ 90.00 0.38065E-02
+ 91.00 0.35064E-02
+ 92.00 0.32271E-02
+ 93.00 0.29718E-02
+ 94.00 0.27429E-02
+ 95.00 0.25419E-02
+ 96.00 0.23695E-02
+ 97.00 0.22258E-02
+ 98.00 0.21104E-02
+ 99.00 0.20219E-02
+ 100.00 0.19588E-02
+ 101.00 0.19190E-02
+ 102.00 0.19000E-02
+ 103.00 0.18990E-02
+ 104.00 0.19129E-02
+ 105.00 0.19388E-02
+ 106.00 0.19737E-02
+ 107.00 0.20146E-02
+ 108.00 0.20588E-02
+ 109.00 0.21037E-02
+ 110.00 0.21469E-02
+ 111.00 0.21863E-02
+ 112.00 0.22200E-02
+ 113.00 0.22463E-02
+ 114.00 0.22640E-02
+ 115.00 0.22721E-02
+ 116.00 0.22700E-02
+ 117.00 0.22574E-02
+ 118.00 0.22345E-02
+ 119.00 0.22016E-02
+ 120.00 0.21591E-02
+ 121.00 0.21078E-02
+ 122.00 0.20486E-02
+ 123.00 0.19825E-02
+ 124.00 0.19105E-02
+ 125.00 0.18339E-02
+ 126.00 0.17538E-02
+ 127.00 0.16717E-02
+ 128.00 0.15888E-02
+ 129.00 0.15064E-02
+ 130.00 0.14255E-02
+ 131.00 0.13473E-02
+ 132.00 0.12727E-02
+ 133.00 0.12024E-02
+ 134.00 0.11371E-02
+ 135.00 0.10774E-02
+ 136.00 0.10237E-02
+ 137.00 0.97626E-03
+ 138.00 0.93530E-03
+ 139.00 0.90088E-03
+ 140.00 0.87292E-03
+ 141.00 0.85123E-03
+ 142.00 0.83555E-03
+ 143.00 0.82550E-03
+ 144.00 0.82069E-03
+ 145.00 0.82064E-03
+ 146.00 0.82486E-03
+ 147.00 0.83282E-03
+ 148.00 0.84399E-03
+ 149.00 0.85782E-03
+ 150.00 0.87377E-03
+ 151.00 0.89132E-03
+ 152.00 0.90999E-03
+ 153.00 0.92933E-03
+ 154.00 0.94897E-03
+ 155.00 0.96854E-03
+ 156.00 0.98776E-03
+ 157.00 0.10063E-02
+ 158.00 0.10241E-02
+ 159.00 0.10408E-02
+ 160.00 0.10563E-02
+ 161.00 0.10706E-02
+ 162.00 0.10836E-02
+ 163.00 0.10953E-02
+ 164.00 0.11057E-02
+ 165.00 0.11148E-02
+ 166.00 0.11228E-02
+ 167.00 0.11296E-02
+ 168.00 0.11355E-02
+ 169.00 0.11404E-02
+ 170.00 0.11445E-02
+ 171.00 0.11479E-02
+ 172.00 0.11506E-02
+ 173.00 0.11527E-02
+ 174.00 0.11543E-02
+ 175.00 0.11556E-02
+ 176.00 0.11566E-02
+ 177.00 0.11572E-02
+ 178.00 0.11577E-02
+ 179.00 0.11580E-02
diff --git a/Inputs/DetectorConfiguration/gaspHyde.detector b/Inputs/DetectorConfiguration/gaspHyde.detector
index 6656f5d2f..8b2e78085 100644
--- a/Inputs/DetectorConfiguration/gaspHyde.detector
+++ b/Inputs/DetectorConfiguration/gaspHyde.detector
@@ -19,7 +19,7 @@
GeneralTarget
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
Target
- THICKNESS= 5
+ THICKNESS= 0.001
RADIUS= 7.5
MATERIAL= CD2
X= 0
@@ -27,76 +27,6 @@ Target
Z= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
GaspardTracker
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-%GPDTrapezoid
- THETA= 0
- PHI= 0
- R= 200
- BETA= 0 0 0
- FIRSTSTAGE= 1
- SECONDSTAGE= 1
- THIRDSTAGE= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Barrel
-%GPDTrapezoid
- X1_Y1= -25.0 -25.00 200.00
- X128_Y1= 25.0 -25.00 200.00
- X1_Y128= -25.0 25.00 200.00
- X128_Y128= 25.0 25.00 200.00
- FIRSTSTAGE= 1
- SECONDSTAGE= 1
- THIRDSTAGE= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-%GPDDummyShape
- THETA= 180
- PHI= 0
- R= 100
- BETA= 0 0 0
- FIRSTSTAGE= 1
- SECONDSTAGE= 1
- THIRDSTAGE= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Barrel
-%GPDDummyShape
- X1_Y1= -25.0 -25.00 -100.00
- X128_Y1= -25.0 25.00 -100.00
- X1_Y128= 25.0 -25.00 -100.00
- X128_Y128= 25.0 25.00 -100.00
- FIRSTSTAGE= 1
- SECONDSTAGE= 1
- THIRDSTAGE= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Barrel
-%GPDDummyShape
- X1_Y1= -10.0 -10.00 100.00
- X128_Y1= -10.0 10.00 100.00
- X1_Y128= 10.0 -10.00 100.00
- X128_Y128= 10.0 10.00 100.00
- FIRSTSTAGE= 1
- SECONDSTAGE= 1
- THIRDSTAGE= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-%GPDSquare
- THETA= 180
- PHI= 0
- R= 100
- BETA= 0 0 0
- FIRSTSTAGE= 1
- SECONDSTAGE= 1
- THIRDSTAGE= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Barrel
-%GPDSquare
- X1_Y1= -49.0 -49.00 -100.00
- X128_Y1= -49.0 49.00 -100.00
- X1_Y128= 49.0 -49.00 -100.00
- X128_Y128= 49.0 49.00 -100.00
- FIRSTSTAGE= 1
- SECONDSTAGE= 1
- THIRDSTAGE= 1
- VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Annular Back
GPDAnnular
Z= -156.5
diff --git a/NPSimulation/Simulation.cc b/NPSimulation/Simulation.cc
index 0a49c6b35..5b5d13824 100644
--- a/NPSimulation/Simulation.cc
+++ b/NPSimulation/Simulation.cc
@@ -106,6 +106,7 @@ int main(int argc, char** argv)
////////////////////// Job termination ////////////////////////
///////////////////////////////////////////////////////////////
RootOutput::getInstance()->Destroy();
+ NPOptionManager::getInstance()->Destroy();
delete runManager;
return 0;
--
GitLab