From f1c763b0063b6120800b2988e0d8883437fd272e Mon Sep 17 00:00:00 2001
From: deserevi <deserevi@nptool>
Date: Fri, 11 Sep 2009 16:04:58 +0000
Subject: [PATCH] * Add TODO file
* Rename Gaspard geometry input files
* Add one differential cross section file
---
Inputs/CrossSection/sn132dp_gs_10AMeV.txt | 60 ++
.../gaspardFull.detector.eps | 892 ------------------
.../gaspardTestSpheric.detector | 4 +-
...rrel.detector => gaspardV1Barrel.detector} | 0
....detector => gaspardV1EndCapBack.detector} | 0
...detector => gaspardV1EndCapFront.detector} | 0
...rdFull.detector => gaspardV1Full.detector} | 0
....detector => gaspardV2EndCapBack.detector} | 0
...detector => gaspardV2EndCapFront.detector} | 0
.../gaspardV2test.detector | 48 -
.../gaspardV2trap.detector | 59 --
.../testPerformance.detector | 365 -------
Inputs/EventGenerator/132Sndp.reaction | 21 +
Inputs/EventGenerator/60Fe.reaction.eps | 649 -------------
Inputs/EventGenerator/60Fe.reaction2.eps | 646 -------------
NPAnalysis/Gaspard/include/ObjectManager.hh | 2 +-
NPAnalysis/Gaspard/src/Analysis.cc | 44 +-
NPLib/GASPARD/TGaspardTrackerPhysics.cxx | 6 +-
.../include/GaspardTrackerDummyShape.hh | 18 +-
NPSimulation/src/EventGeneratorTransfert.cc | 3 +-
TODO | 41 +
21 files changed, 174 insertions(+), 2684 deletions(-)
create mode 100644 Inputs/CrossSection/sn132dp_gs_10AMeV.txt
delete mode 100644 Inputs/DetectorConfiguration/gaspardFull.detector.eps
rename Inputs/DetectorConfiguration/{gaspardBarrel.detector => gaspardV1Barrel.detector} (100%)
rename Inputs/DetectorConfiguration/{gaspardCapBack.detector => gaspardV1EndCapBack.detector} (100%)
rename Inputs/DetectorConfiguration/{gaspardCapFront.detector => gaspardV1EndCapFront.detector} (100%)
rename Inputs/DetectorConfiguration/{gaspardFull.detector => gaspardV1Full.detector} (100%)
rename Inputs/DetectorConfiguration/{gaspardV2CapBack.detector => gaspardV2EndCapBack.detector} (100%)
rename Inputs/DetectorConfiguration/{gaspardV2CapFront.detector => gaspardV2EndCapFront.detector} (100%)
delete mode 100644 Inputs/DetectorConfiguration/gaspardV2test.detector
delete mode 100644 Inputs/DetectorConfiguration/gaspardV2trap.detector
delete mode 100644 Inputs/DetectorConfiguration/testPerformance.detector
create mode 100644 Inputs/EventGenerator/132Sndp.reaction
delete mode 100644 Inputs/EventGenerator/60Fe.reaction.eps
delete mode 100644 Inputs/EventGenerator/60Fe.reaction2.eps
create mode 100644 TODO
diff --git a/Inputs/CrossSection/sn132dp_gs_10AMeV.txt b/Inputs/CrossSection/sn132dp_gs_10AMeV.txt
new file mode 100644
index 000000000..4ea5ac169
--- /dev/null
+++ b/Inputs/CrossSection/sn132dp_gs_10AMeV.txt
@@ -0,0 +1,60 @@
+ 0.00 0.12987E+01
+ 2.00 0.13107E+01
+ 4.00 0.13432E+01
+ 6.00 0.13873E+01
+ 8.00 0.14303E+01
+ 10.00 0.14582E+01
+ 12.00 0.14589E+01
+ 14.00 0.14241E+01
+ 16.00 0.13510E+01
+ 18.00 0.12428E+01
+ 20.00 0.11084E+01
+ 22.00 0.96070E+00
+ 24.00 0.81470E+00
+ 26.00 0.68441E+00
+ 28.00 0.58040E+00
+ 30.00 0.50792E+00
+ 32.00 0.46624E+00
+ 34.00 0.44942E+00
+ 36.00 0.44805E+00
+ 38.00 0.45164E+00
+ 40.00 0.45092E+00
+ 42.00 0.43948E+00
+ 44.00 0.41464E+00
+ 46.00 0.37733E+00
+ 48.00 0.33118E+00
+ 50.00 0.28132E+00
+ 52.00 0.23304E+00
+ 54.00 0.19069E+00
+ 56.00 0.15700E+00
+ 58.00 0.13289E+00
+ 60.00 0.11769E+00
+ 62.00 0.10955E+00
+ 64.00 0.10604E+00
+ 66.00 0.10471E+00
+ 68.00 0.10349E+00
+ 70.00 0.10094E+00
+ 72.00 0.96332E-01
+ 74.00 0.89567E-01
+ 76.00 0.81048E-01
+ 78.00 0.71469E-01
+ 80.00 0.61629E-01
+ 82.00 0.52274E-01
+ 84.00 0.43994E-01
+ 86.00 0.37166E-01
+ 88.00 0.31948E-01
+ 90.00 0.28292E-01
+ 92.00 0.25992E-01
+ 94.00 0.24739E-01
+ 96.00 0.24178E-01
+ 98.00 0.23960E-01
+ 100.00 0.23779E-01
+ 102.00 0.23406E-01
+ 104.00 0.22697E-01
+ 106.00 0.21599E-01
+ 108.00 0.20135E-01
+ 110.00 0.18393E-01
+ 112.00 0.16495E-01
+ 114.00 0.14580E-01
+ 116.00 0.12778E-01
+ 118.00 0.11196E-01
diff --git a/Inputs/DetectorConfiguration/gaspardFull.detector.eps b/Inputs/DetectorConfiguration/gaspardFull.detector.eps
deleted file mode 100644
index faa2e59d2..000000000
--- a/Inputs/DetectorConfiguration/gaspardFull.detector.eps
+++ /dev/null
@@ -1,892 +0,0 @@
-%!PS-Adobe-3.0
-%%Title: gaspardFull.detector
-%%For: Nicolas de Séréville
-%%Creator: a2ps version 4.14
-%%CreationDate: Tue Jun 16 13:26:30 2009
-%%BoundingBox: 24 24 588 768
-%%DocumentData: Clean7Bit
-%%Orientation: Portrait
-%%Pages: 4
-%%PageOrder: Ascend
-%%DocumentMedia: Letter 612 792 0 () ()
-%%DocumentNeededResources: font Courier
-%%+ font Courier-Bold
-%%+ font Courier-BoldOblique
-%%+ font Courier-Oblique
-%%+ font Helvetica
-%%+ font Helvetica-Bold
-%%+ font Symbol
-%%+ font Times-Bold
-%%+ font Times-Roman
-%%DocumentProcessColors: Black
-%%DocumentSuppliedResources: procset a2ps-a2ps-hdr
-%%+ procset a2ps-black+white-Prolog
-%%+ encoding ISO-8859-1Encoding
-%%EndComments
-/a2psdict 200 dict def
-a2psdict begin
-%%BeginProlog
-%%Copyright: (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
-%%Copyright: (c) 1995, 96, 97, 98 Akim Demaille, Miguel Santana
-% Check PostScript language level.
-/languagelevel where {
- pop /gs_languagelevel languagelevel def
-} {
- /gs_languagelevel 1 def
-} ifelse
-
-% EPSF import as in the Red Book
-/BeginInclude {
- /b4_Inc_state save def % Save state for cleanup
- /dict_count countdictstack def % Count objects on dict stack
- /op_count count 1 sub def % Count objects on operand stack
- userdict begin
- 0 setgray 0 setlinecap
- 1 setlinewidth 0 setlinejoin
- 10 setmiterlimit [ ] 0 setdash newpath
- gs_languagelevel 1 ne {
- false setstrokeadjust false setoverprint
- } if
-} bind def
-
-/EndInclude {
- count op_count sub { pos } repeat % Clean up stacks
- countdictstack dict_count sub { end } repeat
- b4_Inc_state restore
-} bind def
-
-/BeginEPSF {
- BeginInclude
- /showpage { } def
-} bind def
-
-/EndEPSF {
- EndInclude
-} bind def
-
-% Page prefeed
-/page_prefeed { % bool -> -
- statusdict /prefeed known {
- statusdict exch /prefeed exch put
- } {
- pop
- } ifelse
-} bind def
-
-/deffont {
- findfont exch scalefont def
-} bind def
-
-/reencode_font {
- findfont reencode 2 copy definefont pop def
-} bind def
-
-% Function c-show (str => -)
-% centers text only according to x axis.
-/c-show {
- dup stringwidth pop
- 2 div neg 0 rmoveto
- show
-} bind def
-
-% Function l-show (str => -)
-% prints texts so that it ends at currentpoint
-/l-show {
- dup stringwidth pop neg
- 0
- rmoveto show
-} bind def
-
-% center-fit show (str w => -)
-% show centered, and scale currentfont so that the width is less than w
-/cfshow {
- exch dup stringwidth pop
- % If the title is too big, try to make it smaller
- 3 2 roll 2 copy
- gt
- { % if, i.e. too big
- exch div
- currentfont exch scalefont setfont
- } { % ifelse
- pop pop
- }
- ifelse
- c-show % center title
-} bind def
-
-% Return the y size of the current font
-% - => fontsize
-/currentfontsize {
- currentfont /FontMatrix get 3 get 1000 mul
-} bind def
-
-% reencode the font
-% <encoding-vector> <fontdict> -> <newfontdict>
-/reencode { %def
- dup length 5 add dict begin
- { %forall
- % <vector> <key> <val>
- 1 index /FID ne
- { def }{ pop pop } ifelse
- } forall
- /Encoding exch def % -
-
- % Use the font's bounding box to determine the ascent, descent,
- % and overall height; don't forget that these values have to be
- % transformed using the font's matrix.
- % We use `load' because sometimes BBox is executable, sometimes not.
- % Since we need 4 numbers an not an array avoid BBox from being executed
- /FontBBox load aload pop
- FontMatrix transform /Ascent exch def pop
- FontMatrix transform /Descent exch def pop
- /FontHeight Ascent Descent sub def
-
- % Get the underline position and thickness if they're defined.
- % Use 1 if they are not defined.
- currentdict /FontInfo 2 copy known
- { get
- /UnderlinePosition 2 copy % <FontInfo> /UP <FontInfo> /UP
- 2 copy known
- { get }{ pop pop 1 } ifelse
- 0 exch FontMatrix transform exch pop
- def % <FontInfo>
-
- /UnderlineThickness 2 copy % <FontInfo> /UT <FontInfo> /UT
- 2 copy known
- { get }{ pop pop 1 } ifelse
- 0 exch FontMatrix transform exch pop
- def % <FontInfo>
- pop % -
- }{ pop pop
- } ifelse
-
- currentdict
- end
-} bind def
-
-% Function print line number (<string> # -)
-/# {
- gsave
- sx cw mul neg 2 div 0 rmoveto
- f# setfont
- c-show
- grestore
-} bind def
-
-% -------- Some routines to enlight plain b/w printings ---------
-
-% Underline
-% width --
-/dounderline {
- currentpoint
- gsave
- moveto
- 0 currentfont /Descent get currentfontsize mul rmoveto
- 0 rlineto
- stroke
- grestore
-} bind def
-
-% Underline a string
-% string --
-/dounderlinestring {
- stringwidth pop
- dounderline
-} bind def
-
-/UL {
- /ul exch store
-} bind def
-
-% Draw a box of WIDTH wrt current font
-% width --
-/dobox {
- currentpoint
- gsave
- newpath
- moveto
- 0 currentfont /Descent get currentfontsize mul rmoveto
- dup 0 rlineto
- 0 currentfont /FontHeight get currentfontsize mul rlineto
- neg 0 rlineto
- closepath
- stroke
- grestore
-} bind def
-
-/BX {
- /bx exch store
-} bind def
-
-% Box a string
-% string --
-/doboxstring {
- stringwidth pop
- dobox
-} bind def
-
-%
-% ------------- Color routines ---------------
-%
-/FG /setrgbcolor load def
-
-% Draw the background
-% width --
-/dobackground {
- currentpoint
- gsave
- newpath
- moveto
- 0 currentfont /Descent get currentfontsize mul rmoveto
- dup 0 rlineto
- 0 currentfont /FontHeight get currentfontsize mul rlineto
- neg 0 rlineto
- closepath
- bgcolor aload pop setrgbcolor
- fill
- grestore
-} bind def
-
-% Draw bg for a string
-% string --
-/dobackgroundstring {
- stringwidth pop
- dobackground
-} bind def
-
-
-/BG {
- dup /bg exch store
- { mark 4 1 roll ] /bgcolor exch store } if
-} bind def
-
-
-/Show {
- bg { dup dobackgroundstring } if
- ul { dup dounderlinestring } if
- bx { dup doboxstring } if
- show
-} bind def
-
-% Function T(ab), jumps to the n-th tabulation in the current line
-/T {
- cw mul x0 add
- bg { dup currentpoint pop sub dobackground } if
- ul { dup currentpoint pop sub dounderline } if
- bx { dup currentpoint pop sub dobox } if
- y0 moveto
-} bind def
-
-% Function n: move to the next line
-/n {
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-% Function N: show and move to the next line
-/N {
- Show
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-/S {
- Show
-} bind def
-
-%%BeginResource: procset a2ps-a2ps-hdr 2.0 2
-%%Copyright: (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
-%%Copyright: (c) 1995, 96, 97, 98 Akim Demaille, Miguel Santana
-% Function title: prints page header.
-% <ct> <rt> <lt> are passed as argument
-/title {
- % 1. Draw the background
- x v get y v get moveto
- gsave
- 0 th 2 div neg rmoveto
- th setlinewidth
- 0.95 setgray
- pw 0 rlineto stroke
- grestore
- % 2. Border it
- gsave
- 0.7 setlinewidth
- pw 0 rlineto
- 0 th neg rlineto
- pw neg 0 rlineto
- closepath stroke
- grestore
- % stk: ct rt lt
- x v get y v get th sub 1 add moveto
-%%IncludeResource: font Helvetica
- fHelvetica fnfs 0.8 mul scalefont setfont
- % 3. The left title
- gsave
- dup stringwidth pop fnfs 0.8 mul add exch % leave space took on stack
- fnfs 0.8 mul hm rmoveto
- show % left title
- grestore
- exch
- % stk: ct ltw rt
- % 4. the right title
- gsave
- dup stringwidth pop fnfs 0.8 mul add exch % leave space took on stack
- dup
- pw exch stringwidth pop fnfs 0.8 mul add sub
- hm
- rmoveto
- show % right title
- grestore
- % stk: ct ltw rtw
- % 5. the center title
- gsave
- pw 3 1 roll
- % stk: ct pw ltw rtw
- 3 copy
- % Move to the center of the left room
- sub add 2 div hm rmoveto
- % What is the available space in here?
- add sub fnfs 0.8 mul sub fnfs 0.8 mul sub
- % stk: ct space_left
-%%IncludeResource: font Helvetica-Bold
- fHelvetica-Bold fnfs scalefont setfont
- cfshow
- grestore
-} bind def
-
-% Function border: prints virtual page border
-/border { %def
- gsave % print four sides
- 0 setgray
- x v get y v get moveto
- 0.7 setlinewidth % of the square
- pw 0 rlineto
- 0 ph neg rlineto
- pw neg 0 rlineto
- closepath stroke
- grestore
-} bind def
-
-% Function water: prints a water mark in background
-/water { %def
- gsave
- scx scy moveto rotate
-%%IncludeResource: font Times-Bold
- fTimes-Bold 100 scalefont setfont
- .97 setgray
- dup stringwidth pop 2 div neg -50 rmoveto
- show
- grestore
-} bind def
-
-% Function rhead: prints the right header
-/rhead { %def
- lx ly moveto
- fHelvetica fnfs 0.8 mul scalefont setfont
- l-show
-} bind def
-
-% Function footer (cf rf lf -> -)
-/footer {
- fHelvetica fnfs 0.8 mul scalefont setfont
- dx dy moveto
- show
-
- snx sny moveto
- l-show
-
- fnx fny moveto
- c-show
-} bind def
-%%EndResource
-%%BeginResource: procset a2ps-black+white-Prolog 2.0 1
-
-% Function T(ab), jumps to the n-th tabulation in the current line
-/T {
- cw mul x0 add y0 moveto
-} bind def
-
-% Function n: move to the next line
-/n { %def
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-% Function N: show and move to the next line
-/N {
- Show
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-/S {
- Show
-} bind def
-
-/p {
- false UL
- false BX
- fCourier bfs scalefont setfont
- Show
-} bind def
-
-/sy {
- false UL
- false BX
- fSymbol bfs scalefont setfont
- Show
-} bind def
-
-/k {
- false UL
- false BX
- fCourier-Oblique bfs scalefont setfont
- Show
-} bind def
-
-/K {
- false UL
- false BX
- fCourier-Bold bfs scalefont setfont
- Show
-} bind def
-
-/c {
- false UL
- false BX
- fCourier-Oblique bfs scalefont setfont
- Show
-} bind def
-
-/C {
- false UL
- false BX
- fCourier-BoldOblique bfs scalefont setfont
- Show
-} bind def
-
-/l {
- false UL
- false BX
- fHelvetica bfs scalefont setfont
- Show
-} bind def
-
-/L {
- false UL
- false BX
- fHelvetica-Bold bfs scalefont setfont
- Show
-} bind def
-
-/str{
- false UL
- false BX
- fTimes-Roman bfs scalefont setfont
- Show
-} bind def
-
-/e{
- false UL
- true BX
- fHelvetica-Bold bfs scalefont setfont
- Show
-} bind def
-
-%%EndResource
-%%EndProlog
-%%BeginSetup
-%%IncludeResource: font Courier
-%%IncludeResource: font Courier-Oblique
-%%IncludeResource: font Courier-Bold
-%%IncludeResource: font Times-Roman
-%%IncludeResource: font Symbol
-%%IncludeResource: font Courier-BoldOblique
-%%BeginResource: encoding ISO-8859-1Encoding
-/ISO-8859-1Encoding [
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-/parenleft /parenright /asterisk /plus /comma /minus /period /slash
-/zero /one /two /three /four /five /six /seven
-/eight /nine /colon /semicolon /less /equal /greater /question
-/at /A /B /C /D /E /F /G
-/H /I /J /K /L /M /N /O
-/P /Q /R /S /T /U /V /W
-/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-/quoteleft /a /b /c /d /e /f /g
-/h /i /j /k /l /m /n /o
-/p /q /r /s /t /u /v /w
-/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/space /exclamdown /cent /sterling /currency /yen /brokenbar /section
-/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron
-/degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /bullet
-/cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-/Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-/Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-/agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-/egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
-/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-%%EndResource
-% Initialize page description variables.
-/sh 792 def
-/sw 612 def
-/llx 24 def
-/urx 588 def
-/ury 768 def
-/lly 24 def
-/#copies 1 def
-/th 20.000000 def
-/fnfs 15 def
-/bfs 11.547912 def
-/cw 6.928747 def
-
-% Dictionary for ISO-8859-1 support
-/iso1dict 8 dict begin
- /fCourier ISO-8859-1Encoding /Courier reencode_font
- /fCourier-Bold ISO-8859-1Encoding /Courier-Bold reencode_font
- /fCourier-BoldOblique ISO-8859-1Encoding /Courier-BoldOblique reencode_font
- /fCourier-Oblique ISO-8859-1Encoding /Courier-Oblique reencode_font
- /fHelvetica ISO-8859-1Encoding /Helvetica reencode_font
- /fHelvetica-Bold ISO-8859-1Encoding /Helvetica-Bold reencode_font
- /fTimes-Bold ISO-8859-1Encoding /Times-Bold reencode_font
- /fTimes-Roman ISO-8859-1Encoding /Times-Roman reencode_font
-currentdict end def
-/bgcolor [ 0 0 0 ] def
-/bg false def
-/ul false def
-/bx false def
-% The font for line numbering
-/f# /Helvetica findfont bfs .6 mul scalefont def
-/fSymbol /Symbol findfont def
-/hm fnfs 0.25 mul def
-/pw
- cw 81.400000 mul
-def
-/ph
- 689.410325 th add
-def
-/pmw 0 def
-/pmh 0 def
-/v 0 def
-/x [
- 0
-] def
-/y [
- pmh ph add 0 mul ph add
-] def
-/scx sw 2 div def
-/scy sh 2 div def
-/snx urx def
-/sny lly 2 add def
-/dx llx def
-/dy sny def
-/fnx scx def
-/fny dy def
-/lx snx def
-/ly ury fnfs 0.8 mul sub def
-/sx 0 def
-/tab 8 def
-/x0 0 def
-/y0 0 def
-%%EndSetup
-
-%%Page: (1) 1
-%%BeginPageSetup
-/pagesave save def
-%%EndPageSetup
-iso1dict begin
-gsave
-llx lly 12 add translate
-/v 0 store
-/x0 x v get 4.850123 add sx cw mul add store
-/y0 y v get bfs th add sub store
-x0 y0 moveto
-(%%%%%%%%%%Detector%%%%%%%%%%%%%%%%%%%) p n
-(%%Position and distance given in mm) N
-(%%Angle given in degree) N
-(%% using the data from the experimental mesurement) N
-(%% special care is given for the X Y direction) N
-(%% NOTATTION USED IN THE FOLLOWING:) N
-(%%) N
-(%% X1_Y1 ) S 16 T () S 24 T (--> X:1 Y:1) N
-(%% X128_Y1 ) S 16 T () S 24 T (--> X:128 Y:1) N
-(%% X1_Y128 ) S 16 T () S 24 T (--> X:1 Y:128) N
-(%% X128_Y128 ) S 16 T (--> X:128 Y:128) N
-(%%Option: 0,1 for Si SiLi and CSI) N
-(%%Option: all or sensible for VISualisation) N
-(% 1.2 12.371134021) N
-(% 2 20.618556701) N
-(% 30 309.278350515) N
-() N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1) N
-(GeneralTarget) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1) N
-(Target) N
-() S 8 T (THICKNESS= 309.278350515) N
-() S 8 T (RADIUS=) S 16 T (7.5) N
-() S 8 T (MATERIAL= CD2) N
-() S 8 T (X= 0) N
-() S 8 T (Y= 0) N
-() S 8 T (Z= 0) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%) S 40 T () N
-(Gaspard) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Barrel) N
-(GPDSquare ) N
-() S 8 T (X1_Y1=) S 16 T ( ) S 24 T (49.1) S 32 T (66.08) S 40 T (-135.41) N
-() S 8 T (X128_Y1=) S 24 T (-48.9) S 32 T (66.22) S 40 T (-135.41) N
-() S 8 T (X1_Y128=) S 24 T (-48.8) S 32 T (135.51) S 40 T (-66.1) N
-() S 8 T (X128_Y128=) S 24 T (49.2) S 32 T (135.36) S 40 T (-66.1) N
-() S 8 T (FIRSTSTAGE= 1) N
-() S 8 T (SECONDSTAGE= 0) N
-() S 8 T (THIRDSTAGE= 0) N
-() S 8 T (VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2) N
-(GPDSquare ) N
-() S 8 T (X1_Y1=) S 16 T ( ) S 24 T (-66.04) S 32 T (61.23) S 40 T (-130.4) N
-() S 8 T (X128_Y1=) S 24 T (-135.4) S 32 T (12.32) S 40 T (-81.4) N
-() S 8 T (X1_Y128=) S 24 T (-65.94) S 32 T (130.51) S 40 T (-61.09) N
-() S 8 T (X128_Y128=) S 24 T (-135.3) S 32 T (81.6) S 40 T (-12.1) N
-() S 8 T (FIRSTSTAGE= 1) N
-() S 8 T (SECONDSTAGE= 0) N
-() S 8 T (THIRDSTAGE= 0) N
-() S 8 T (VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3) N
-(GPDSquare ) N
-() S 8 T (X1_Y1=) S 16 T ( ) S 24 T (-142.52) S 32 T (0.22) S 40 T (-69.3) N
-() S 8 T (X128_Y1=) S 24 T (-142.62) S 32 T (-69.09) S 40 T (-0.01) N
-() S 8 T (X1_Y128=) S 24 T (-142.42) S 32 T (69.5) S 40 T (0.01) N
-() S 8 T (X128_Y128=) S 24 T (-142.52) S 32 T (0.19) S 40 T (69.3) N
-() S 8 T (FIRSTSTAGE= 1) N
-() S 8 T (SECONDSTAGE= 0) N
-() S 8 T (THIRDSTAGE= 0) N
-() S 8 T (VIS= all) N
-(gaspardFull.detector) (Page 1/4) (Jun 08, 09 10:39) title
-border
-grestore
-(Printed by Nicolas de S\303\251r\303\251ville) rhead
-() (1/4) (Tuesday June 16, 2009) footer
-end % of iso1dict
-pagesave restore
-showpage
-%%Page: (2) 2
-%%BeginPageSetup
-/pagesave save def
-%%EndPageSetup
-iso1dict begin
-gsave
-llx lly 12 add translate
-/v 0 store
-/x0 x v get 4.850123 add sx cw mul add store
-/y0 y v get bfs th add sub store
-x0 y0 moveto
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4) p n
-(GPDSquare ) N
-() S 8 T (X1_Y1=) S 16 T ( ) S 24 T (-135.54) S 32 T (-81.21) S 40 T (12.1) N
-() S 8 T (X128_Y1=) S 24 T (-66.31) S 32 T (-130.32) S 40 T (61.09) N
-() S 8 T (X1_Y128=) S 24 T (-135.44) S 32 T (-11.93) S 40 T (81.4) N
-() S 8 T (X128_Y128=) S 24 T (-66.21) S 32 T (-61.04) S 40 T (130.4) N
-() S 8 T (FIRSTSTAGE= 1) N
-() S 8 T (SECONDSTAGE= 0) N
-() S 8 T (THIRDSTAGE= 0) N
-() S 8 T (VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5) N
-(GPDSquare ) N
-() S 8 T (X1_Y1=) S 16 T ( ) S 24 T (-49.2) S 32 T (-135.36) S 40 T (66.1) N
-() S 8 T (X128_Y1=) S 24 T (48.8) S 32 T (-135.51) S 40 T (66.1) N
-() S 8 T (X1_Y128=) S 24 T (48.9) S 32 T (-66.22) S 40 T (135.41) N
-() S 8 T (X128_Y128=) S 24 T (-49.1) S 32 T (-66.08) S 40 T (135.41) N
-() S 8 T (FIRSTSTAGE= 1) N
-() S 8 T (SECONDSTAGE= 0) N
-() S 8 T (THIRDSTAGE= 0) N
-() S 8 T (VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6) N
-(GPDSquare ) N
-() S 8 T (X1_Y1=) S 16 T ( ) S 24 T (65.94) S 32 T (-130.51) S 40 T (61.09) N
-() S 8 T (X128_Y1=) S 24 T (135.3) S 32 T (-81.6) S 40 T (12.1) N
-() S 8 T (X1_Y128=) S 24 T (135.4) S 32 T (-12.32) S 40 T (81.4) N
-() S 8 T (X128_Y128=) S 24 T (66.04) S 32 T (-61.23) S 40 T (130.4) N
-() S 8 T (FIRSTSTAGE= 1) N
-() S 8 T (SECONDSTAGE= 0) N
-() S 8 T (THIRDSTAGE= 0) N
-() S 8 T (VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%7) N
-(GPDSquare ) N
-() S 8 T (X1_Y1=) S 16 T ( ) S 24 T (142.42) S 32 T (-69.5) S 40 T (-0.01) N
-() S 8 T (X128_Y1=) S 24 T (142.52) S 32 T (-0.19) S 40 T (-69.3) N
-() S 8 T (X1_Y128=) S 24 T (142.52) S 32 T (-0.22) S 40 T (69.3) N
-() S 8 T (X128_Y128=) S 24 T (142.62) S 32 T (69.09) S 40 T (0.01) N
-() S 8 T (FIRSTSTAGE= 1) N
-() S 8 T (SECONDSTAGE= 0) N
-() S 8 T (THIRDSTAGE= 0) N
-() S 8 T (VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%8) N
-(GPDSquare ) N
-() S 8 T (X1_Y1=) S 16 T ( ) S 24 T (135.44) S 32 T (11.93) S 40 T (-81.4) N
-() S 8 T (X128_Y1=) S 24 T (66.21) S 32 T (61.04) S 40 T (-130.4) N
-() S 8 T (X1_Y128=) S 24 T (66.31) S 32 T (130.32) S 40 T (-61.09) N
-() S 8 T (X128_Y128=) S 24 T (135.54) S 32 T (81.21) S 40 T ( -12.1) N
-() S 8 T (FIRSTSTAGE= 1) N
-() S 8 T (SECONDSTAGE= 0) N
-() S 8 T (THIRDSTAGE= 0) N
-() S 8 T (VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Cap Back) N
-(GPDSquare) N
-( X1_Y1= -12.17 -38.15 -153.33) N
-( X128_Y1= -81.53 -87.06 -104.34) N
-( X1_Y128= -61.04 45.57 -138.96) N
-( X128_Y128= -130.41 -3.34 -89.97) N
-( FIRSTSTAGE= 1) N
-( SECONDSTAGE= 0) N
-( THIRDSTAGE= 0) N
-(gaspardFull.detector) (Page 2/4) (Jun 08, 09 10:39) title
-border
-grestore
-(Printed by Nicolas de S\303\251r\303\251ville) rhead
-() (Tuesday June 16, 2009) (2/4) footer
-end % of iso1dict
-pagesave restore
-showpage
-%%Page: (3) 3
-%%BeginPageSetup
-/pagesave save def
-%%EndPageSetup
-iso1dict begin
-gsave
-llx lly 12 add translate
-/v 0 store
-/x0 x v get 4.850123 add sx cw mul add store
-/y0 y v get bfs th add sub store
-x0 y0 moveto
-( VIS= all) p n
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2) N
-(GPDSquare) N
-( X1_Y1= -12.33 -153.3 -38.22) N
-( X128_Y1= -61.31 -138.89 45.43) N
-( X1_Y128= -130.54 -89.78 -3.56) N
-( X128_Y128= -81.56 -104.19 -87.21) N
-( FIRSTSTAGE= 1) N
-( SECONDSTAGE= 0) N
-( THIRDSTAGE= 0) N
-( VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3) N
-(GPDSquare) N
-( X1_Y1= 11.89 -153.33 -38.22) N
-( X128_Y1= 81.26 -104.42 -87.21) N
-( X1_Y128= 60.91 -139.07 45.43) N
-( X128_Y128= 130.28 -130.28 -3.56) N
-( FIRSTSTAGE= 1) N
-( SECONDSTAGE= 0) N
-( THIRDSTAGE= 0) N
-( VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4) N
-(GPDSquare) N
-( X1_Y1= 130.4 -3.72 -89.97) N
-( X128_Y1= 81.28 -87.29 -104.34) N
-( X1_Y128= 12.06 -38.18 -153.33) N
-( X128_Y128= 61.18 45.39 -138.96) N
-( FIRSTSTAGE= 1) N
-( SECONDSTAGE= 0) N
-( THIRDSTAGE= 0) N
-( VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5) N
-(GPDSquare) N
-( X1_Y1= 69.15 -100.86 -100.79) N
-( X128_Y1= -0.22 -149.76 -51.8) N
-( X1_Y128= -0.08 -51.75 -149.78) N
-( X128_Y128= -69.44 -100.66 -100.79) N
-( FIRSTSTAGE= 1) N
-( SECONDSTAGE= 0) N
-( THIRDSTAGE= 0) N
-( VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Cap Front) N
-(GPDSquare ) N
-( X1_Y1= -60.91 139.07 -45.43) N
-( X128_Y1= -130.28 90.16 3.6) N
-( X1_Y128= -81.26 104.42 87.21) N
-( X128_Y128= -11.89 153.33 38.22) N
-( FIRSTSTAGE= 1) N
-( SECONDSTAGE= 0) N
-( THIRDSTAGE= 0) N
-( VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2) N
-(GPDSquare ) N
-( X1_Y1= -81.28 87.29 104.34) N
-( X128_Y1= -130.40 3.72 89.97) N
-( X1_Y128= -12.06 38.18 153.33) N
-( X128_Y128= -61.18 -45.39 138.96) N
-( FIRSTSTAGE= 1) N
-( SECONDSTAGE= 0) N
-(gaspardFull.detector) (Page 3/4) (Jun 08, 09 10:39) title
-border
-grestore
-(Printed by Nicolas de S\303\251r\303\251ville) rhead
-() (3/4) (Tuesday June 16, 2009) footer
-end % of iso1dict
-pagesave restore
-showpage
-%%Page: (4) 4
-%%BeginPageSetup
-/pagesave save def
-%%EndPageSetup
-iso1dict begin
-gsave
-llx lly 12 add translate
-/v 0 store
-/x0 x v get 4.850123 add sx cw mul add store
-/y0 y v get bfs th add sub store
-x0 y0 moveto
-( THIRDSTAGE= 0) p n
-( VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3) N
-(GPDSquare ) N
-( X1_Y1= 81.53 87.06 104.34) N
-( X128_Y1= 12.17 38.15 153.33) N
-( X1_Y128= 61.04 -45.57 138.96) N
-( X128_Y128= 130.411 3.34 89.97) N
-( FIRSTSTAGE= 1) N
-( SECONDSTAGE= 0) N
-( THIRDSTAGE= 0) N
-( VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4) N
-(GPDSquare) N
-( X1_Y1= 61.31 138.89 -45.43) N
-( X128_Y1= 12.33 153.30 38.22) N
-( X1_Y128= 81.56 104.19 87.21) N
-( X128_Y128= 130.54 89.78 3.56) N
-( FIRSTSTAGE= 1) N
-( SECONDSTAGE= 0) N
-( THIRDSTAGE= 0) N
-( VIS= all) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5) N
-(GPDSquare) N
-( X1_Y1= 0.22 149.76 51.80) N
-( X128_Y1= -69.15 100.86 100.79) N
-( X1_Y128= 0.08 51.75 149.78) N
-( X128_Y128= 69.44 100.66 100.79) N
-( FIRSTSTAGE= 1) N
-( SECONDSTAGE= 0) N
-( THIRDSTAGE= 0) N
-( VIS= all) N
-(gaspardFull.detector) (Page 4/4) (Jun 08, 09 10:39) title
-border
-grestore
-(Printed by Nicolas de S\303\251r\303\251ville) rhead
-() (Tuesday June 16, 2009) (4/4) footer
-end % of iso1dict
-pagesave restore
-showpage
-
-%%Trailer
-end
-%%EOF
diff --git a/Inputs/DetectorConfiguration/gaspardTestSpheric.detector b/Inputs/DetectorConfiguration/gaspardTestSpheric.detector
index c2459a56b..5465fea04 100644
--- a/Inputs/DetectorConfiguration/gaspardTestSpheric.detector
+++ b/Inputs/DetectorConfiguration/gaspardTestSpheric.detector
@@ -9,8 +9,8 @@
GeneralTarget
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Target
- THICKNESS= 1
- RADIUS= 45
+ THICKNESS= 0.0001
+ RADIUS= 12
MATERIAL= CD2
X= 0
Y= 0
diff --git a/Inputs/DetectorConfiguration/gaspardBarrel.detector b/Inputs/DetectorConfiguration/gaspardV1Barrel.detector
similarity index 100%
rename from Inputs/DetectorConfiguration/gaspardBarrel.detector
rename to Inputs/DetectorConfiguration/gaspardV1Barrel.detector
diff --git a/Inputs/DetectorConfiguration/gaspardCapBack.detector b/Inputs/DetectorConfiguration/gaspardV1EndCapBack.detector
similarity index 100%
rename from Inputs/DetectorConfiguration/gaspardCapBack.detector
rename to Inputs/DetectorConfiguration/gaspardV1EndCapBack.detector
diff --git a/Inputs/DetectorConfiguration/gaspardCapFront.detector b/Inputs/DetectorConfiguration/gaspardV1EndCapFront.detector
similarity index 100%
rename from Inputs/DetectorConfiguration/gaspardCapFront.detector
rename to Inputs/DetectorConfiguration/gaspardV1EndCapFront.detector
diff --git a/Inputs/DetectorConfiguration/gaspardFull.detector b/Inputs/DetectorConfiguration/gaspardV1Full.detector
similarity index 100%
rename from Inputs/DetectorConfiguration/gaspardFull.detector
rename to Inputs/DetectorConfiguration/gaspardV1Full.detector
diff --git a/Inputs/DetectorConfiguration/gaspardV2CapBack.detector b/Inputs/DetectorConfiguration/gaspardV2EndCapBack.detector
similarity index 100%
rename from Inputs/DetectorConfiguration/gaspardV2CapBack.detector
rename to Inputs/DetectorConfiguration/gaspardV2EndCapBack.detector
diff --git a/Inputs/DetectorConfiguration/gaspardV2CapFront.detector b/Inputs/DetectorConfiguration/gaspardV2EndCapFront.detector
similarity index 100%
rename from Inputs/DetectorConfiguration/gaspardV2CapFront.detector
rename to Inputs/DetectorConfiguration/gaspardV2EndCapFront.detector
diff --git a/Inputs/DetectorConfiguration/gaspardV2test.detector b/Inputs/DetectorConfiguration/gaspardV2test.detector
deleted file mode 100644
index 3360566ba..000000000
--- a/Inputs/DetectorConfiguration/gaspardV2test.detector
+++ /dev/null
@@ -1,48 +0,0 @@
-%%%%%%%%%%Detector%%%%%%%%%%%%%%%%%%%
-%%Position and distance given in mm
-%%Angle given in degree
-%% using the data from the experimental mesurement
-%% special care is given for the X Y direction
-%% NOTATTION USED IN THE FOLLOWING:
-%%
-%% X1_Y1 --> X:1 Y:1
-%% X128_Y1 --> X:128 Y:1
-%% X1_Y128 --> X:1 Y:128
-%% X128_Y128 --> X:128 Y:128
-%%Option: 0,1 for Si SiLi and CSI
-%%Option: all or sensible for VISualisation
-% 1.2 12.371134021
-% 2 20.618556701
-% 30 309.278350515
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
-GeneralTarget
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
-Target
- THICKNESS= 0.001
- RADIUS= 7.5
- MATERIAL= CD2
- X= 0
- Y= 0
- Z= 0
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-GaspardTracker
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Annular Back
-GPDAnnular
- Z= -200
- RMIN= 16
- RMAX= 52
- FIRSTSTAGE= 1
- SECONDSTAGE= 0
- THIRDSTAGE= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 End-Cap Back
-GPDTrapezoid
- X1_Y1= 45.64 34.43 -146.50
- X128_Y1= 91.09 79.82 -91.36
- X1_Y128= 120.84 8.00 -91.36
- X128_Y128= 56.59 8.00 -146.50
- FIRSTSTAGE= 1
- SECONDSTAGE= 0
- THIRDSTAGE= 1
- VIS= all
diff --git a/Inputs/DetectorConfiguration/gaspardV2trap.detector b/Inputs/DetectorConfiguration/gaspardV2trap.detector
deleted file mode 100644
index b1dbaab6d..000000000
--- a/Inputs/DetectorConfiguration/gaspardV2trap.detector
+++ /dev/null
@@ -1,59 +0,0 @@
-%%%%%%%%%%Detector%%%%%%%%%%%%%%%%%%%
-%%Position and distance given in mm
-%%Angle given in degree
-%% using the data from the experimental mesurement
-%% special care is given for the X Y direction
-%% NOTATTION USED IN THE FOLLOWING:
-%%
-%% X1_Y1 --> X:1 Y:1
-%% X128_Y1 --> X:128 Y:1
-%% X1_Y128 --> X:1 Y:128
-%% X128_Y128 --> X:128 Y:128
-%%Option: 0,1 for Si SiLi and CSI
-%%Option: all or sensible for VISualisation
-% 1.2 12.371134021
-% 2 20.618556701
-% 30 309.278350515
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
-GeneralTarget
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
-Target
- THICKNESS= 0.001
- RADIUS= 7.5
- MATERIAL= CD2
- X= 0
- Y= 0
- Z= 0
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-GaspardTracker
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Barrel
-GPDSquare
- X1_Y1= 49.1 66.08 -135.41
- X128_Y1= -48.9 66.22 -135.41
- X1_Y128= -48.8 135.51 -66.1
- X128_Y128= 49.2 135.36 -66.1
- FIRSTSTAGE= 1
- SECONDSTAGE= 0
- THIRDSTAGE= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-GPDTrapezoid
- THETA= 0
- PHI= 0
- R= 20
- BETA= 0
- FIRSTSTAGE= 0
- SECONDSTAGE= 0
- THIRDSTAGE= 0
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Barrel
-GPDTrapezoid
- X1_Y1= 122.02 14.32 -4.45
- X128_Y1= 122.02 38.86 76.58
- X1_Y128= 122.02 -38.88 76.58
- X128_Y128= 122.02 -14.29 -4.45
- FIRSTSTAGE= 0
- SECONDSTAGE= 0
- THIRDSTAGE= 0
- VIS= all
diff --git a/Inputs/DetectorConfiguration/testPerformance.detector b/Inputs/DetectorConfiguration/testPerformance.detector
deleted file mode 100644
index fed3091d0..000000000
--- a/Inputs/DetectorConfiguration/testPerformance.detector
+++ /dev/null
@@ -1,365 +0,0 @@
-%Fichier de configuration manip E225
-%%%%%%%%%%%Target%%%%%%%%%%%%%%%%%%%1
-%Thickness in micrometer
-%Radius in mm
-%Temperature in K, Pressure in bar
-%Material name according to the target library
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-GeneralTarget
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Target
- THICKNESS= 1
- RADIUS= 45
- MATERIAL= CD2
- X= 0
- Y= 0
- Z= 0
-%%%%%%%%%%Detector%%%%%%%%%%%%%%%%%%%
-%%Position and R given in mm
-%%Angle given in degree
-%%Option: 0,1 for Si SiLi and CsI
-%%Option: all or sensible for VISualisation
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-MUST2Array
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
-M2Telescope
- THETA= 0
- PHI= 0
- R= 300
- BETA= 0 -0 -0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-M2Telescope
- THETA= 30
- PHI= 0
- R= 300
- BETA= 0 -0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
-M2Telescope
- THETA= 60
- PHI= 0
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
- THETA= 90
- PHI= 0
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
-M2Telescope
- THETA= 120
- PHI= 0
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 150
- PHI= 0
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%7
-M2Telescope
- THETA= 180
- PHI= 0
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%8
-M2Telescope
- THETA= -30
- PHI= 0
- R= 300
- BETA= 0 -0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%9
-M2Telescope
- THETA= -60
- PHI= 0
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%10
-M2Telescope
- THETA= -90
- PHI= 0
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%11
-M2Telescope
- THETA= -120
- PHI= 0
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%12
-M2Telescope
- THETA= -150
- PHI= 0
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-M2Telescope
- THETA= 30
- PHI= 90
- R= 300
- BETA= 0 -0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
-M2Telescope
- THETA= 60
- PHI= 90
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
- THETA= 90
- PHI= 90
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
-M2Telescope
- THETA= 120
- PHI= 90
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 150
- PHI= 90
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-M2Telescope
- THETA= 30
- PHI= -90
- R= 300
- BETA= 0 -0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
-M2Telescope
- THETA= 60
- PHI= -90
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
- THETA= 90
- PHI= -90
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
-M2Telescope
- THETA= 120
- PHI= -90
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 150
- PHI= -90
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 45
- PHI= 45
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 90
- PHI= 45
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 135
- PHI= 45
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 45
- PHI= -45
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 90
- PHI= -45
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 135
- PHI= -45
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 45
- PHI= -135
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 90
- PHI= -135
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 135
- PHI= -135
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 45
- PHI= 135
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 90
- PHI= 135
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
-M2Telescope
- THETA= 135
- PHI= 135
- R= 300
- BETA= 0 0 0
- SI= 1
- SILI= 0
- CSI= 1
- VIS= all
diff --git a/Inputs/EventGenerator/132Sndp.reaction b/Inputs/EventGenerator/132Sndp.reaction
new file mode 100644
index 000000000..fd8854164
--- /dev/null
+++ b/Inputs/EventGenerator/132Sndp.reaction
@@ -0,0 +1,21 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Reaction file for 60Fe(d,p)61Fe reaction %%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad
+Transfert
+ Beam= 132Sn
+ Target= 2H
+ Light= 1H
+ Heavy= 133Sn
+ ExcitationEnergy= 0.0
+ BeamEnergy= 1320
+ BeamEnergySpread= 0
+ SigmaX= 0
+ SigmaY= 0
+ SigmaThetaX= 0
+ SigmaPhiY= 0
+ CrossSectionPath= sn132dp_gs_10AMeV.txt
+ ShootLight= 1
+ ShootHeavy= 0
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
diff --git a/Inputs/EventGenerator/60Fe.reaction.eps b/Inputs/EventGenerator/60Fe.reaction.eps
deleted file mode 100644
index b2dbcb72b..000000000
--- a/Inputs/EventGenerator/60Fe.reaction.eps
+++ /dev/null
@@ -1,649 +0,0 @@
-%!PS-Adobe-3.0
-%%Title: 60Fe.reaction
-%%For: Nicolas de Séréville
-%%Creator: a2ps version 4.14
-%%CreationDate: Tue Jun 16 11:57:57 2009
-%%BoundingBox: 24 24 588 768
-%%DocumentData: Clean7Bit
-%%Orientation: Landscape
-%%Pages: 1
-%%PageOrder: Ascend
-%%DocumentMedia: Letter 612 792 0 () ()
-%%DocumentNeededResources: font Courier
-%%+ font Courier-Bold
-%%+ font Courier-BoldOblique
-%%+ font Courier-Oblique
-%%+ font Helvetica
-%%+ font Helvetica-Bold
-%%+ font Symbol
-%%+ font Times-Bold
-%%+ font Times-Roman
-%%DocumentProcessColors: Black
-%%DocumentSuppliedResources: procset a2ps-a2ps-hdr
-%%+ procset a2ps-black+white-Prolog
-%%+ encoding ISO-8859-1Encoding
-%%EndComments
-/a2psdict 200 dict def
-a2psdict begin
-%%BeginProlog
-%%Copyright: (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
-%%Copyright: (c) 1995, 96, 97, 98 Akim Demaille, Miguel Santana
-% Check PostScript language level.
-/languagelevel where {
- pop /gs_languagelevel languagelevel def
-} {
- /gs_languagelevel 1 def
-} ifelse
-
-% EPSF import as in the Red Book
-/BeginInclude {
- /b4_Inc_state save def % Save state for cleanup
- /dict_count countdictstack def % Count objects on dict stack
- /op_count count 1 sub def % Count objects on operand stack
- userdict begin
- 0 setgray 0 setlinecap
- 1 setlinewidth 0 setlinejoin
- 10 setmiterlimit [ ] 0 setdash newpath
- gs_languagelevel 1 ne {
- false setstrokeadjust false setoverprint
- } if
-} bind def
-
-/EndInclude {
- count op_count sub { pos } repeat % Clean up stacks
- countdictstack dict_count sub { end } repeat
- b4_Inc_state restore
-} bind def
-
-/BeginEPSF {
- BeginInclude
- /showpage { } def
-} bind def
-
-/EndEPSF {
- EndInclude
-} bind def
-
-% Page prefeed
-/page_prefeed { % bool -> -
- statusdict /prefeed known {
- statusdict exch /prefeed exch put
- } {
- pop
- } ifelse
-} bind def
-
-/deffont {
- findfont exch scalefont def
-} bind def
-
-/reencode_font {
- findfont reencode 2 copy definefont pop def
-} bind def
-
-% Function c-show (str => -)
-% centers text only according to x axis.
-/c-show {
- dup stringwidth pop
- 2 div neg 0 rmoveto
- show
-} bind def
-
-% Function l-show (str => -)
-% prints texts so that it ends at currentpoint
-/l-show {
- dup stringwidth pop neg
- 0
- rmoveto show
-} bind def
-
-% center-fit show (str w => -)
-% show centered, and scale currentfont so that the width is less than w
-/cfshow {
- exch dup stringwidth pop
- % If the title is too big, try to make it smaller
- 3 2 roll 2 copy
- gt
- { % if, i.e. too big
- exch div
- currentfont exch scalefont setfont
- } { % ifelse
- pop pop
- }
- ifelse
- c-show % center title
-} bind def
-
-% Return the y size of the current font
-% - => fontsize
-/currentfontsize {
- currentfont /FontMatrix get 3 get 1000 mul
-} bind def
-
-% reencode the font
-% <encoding-vector> <fontdict> -> <newfontdict>
-/reencode { %def
- dup length 5 add dict begin
- { %forall
- % <vector> <key> <val>
- 1 index /FID ne
- { def }{ pop pop } ifelse
- } forall
- /Encoding exch def % -
-
- % Use the font's bounding box to determine the ascent, descent,
- % and overall height; don't forget that these values have to be
- % transformed using the font's matrix.
- % We use `load' because sometimes BBox is executable, sometimes not.
- % Since we need 4 numbers an not an array avoid BBox from being executed
- /FontBBox load aload pop
- FontMatrix transform /Ascent exch def pop
- FontMatrix transform /Descent exch def pop
- /FontHeight Ascent Descent sub def
-
- % Get the underline position and thickness if they're defined.
- % Use 1 if they are not defined.
- currentdict /FontInfo 2 copy known
- { get
- /UnderlinePosition 2 copy % <FontInfo> /UP <FontInfo> /UP
- 2 copy known
- { get }{ pop pop 1 } ifelse
- 0 exch FontMatrix transform exch pop
- def % <FontInfo>
-
- /UnderlineThickness 2 copy % <FontInfo> /UT <FontInfo> /UT
- 2 copy known
- { get }{ pop pop 1 } ifelse
- 0 exch FontMatrix transform exch pop
- def % <FontInfo>
- pop % -
- }{ pop pop
- } ifelse
-
- currentdict
- end
-} bind def
-
-% Function print line number (<string> # -)
-/# {
- gsave
- sx cw mul neg 2 div 0 rmoveto
- f# setfont
- c-show
- grestore
-} bind def
-
-% -------- Some routines to enlight plain b/w printings ---------
-
-% Underline
-% width --
-/dounderline {
- currentpoint
- gsave
- moveto
- 0 currentfont /Descent get currentfontsize mul rmoveto
- 0 rlineto
- stroke
- grestore
-} bind def
-
-% Underline a string
-% string --
-/dounderlinestring {
- stringwidth pop
- dounderline
-} bind def
-
-/UL {
- /ul exch store
-} bind def
-
-% Draw a box of WIDTH wrt current font
-% width --
-/dobox {
- currentpoint
- gsave
- newpath
- moveto
- 0 currentfont /Descent get currentfontsize mul rmoveto
- dup 0 rlineto
- 0 currentfont /FontHeight get currentfontsize mul rlineto
- neg 0 rlineto
- closepath
- stroke
- grestore
-} bind def
-
-/BX {
- /bx exch store
-} bind def
-
-% Box a string
-% string --
-/doboxstring {
- stringwidth pop
- dobox
-} bind def
-
-%
-% ------------- Color routines ---------------
-%
-/FG /setrgbcolor load def
-
-% Draw the background
-% width --
-/dobackground {
- currentpoint
- gsave
- newpath
- moveto
- 0 currentfont /Descent get currentfontsize mul rmoveto
- dup 0 rlineto
- 0 currentfont /FontHeight get currentfontsize mul rlineto
- neg 0 rlineto
- closepath
- bgcolor aload pop setrgbcolor
- fill
- grestore
-} bind def
-
-% Draw bg for a string
-% string --
-/dobackgroundstring {
- stringwidth pop
- dobackground
-} bind def
-
-
-/BG {
- dup /bg exch store
- { mark 4 1 roll ] /bgcolor exch store } if
-} bind def
-
-
-/Show {
- bg { dup dobackgroundstring } if
- ul { dup dounderlinestring } if
- bx { dup doboxstring } if
- show
-} bind def
-
-% Function T(ab), jumps to the n-th tabulation in the current line
-/T {
- cw mul x0 add
- bg { dup currentpoint pop sub dobackground } if
- ul { dup currentpoint pop sub dounderline } if
- bx { dup currentpoint pop sub dobox } if
- y0 moveto
-} bind def
-
-% Function n: move to the next line
-/n {
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-% Function N: show and move to the next line
-/N {
- Show
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-/S {
- Show
-} bind def
-
-%%BeginResource: procset a2ps-a2ps-hdr 2.0 2
-%%Copyright: (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
-%%Copyright: (c) 1995, 96, 97, 98 Akim Demaille, Miguel Santana
-% Function title: prints page header.
-% <ct> <rt> <lt> are passed as argument
-/title {
- % 1. Draw the background
- x v get y v get moveto
- gsave
- 0 th 2 div neg rmoveto
- th setlinewidth
- 0.95 setgray
- pw 0 rlineto stroke
- grestore
- % 2. Border it
- gsave
- 0.7 setlinewidth
- pw 0 rlineto
- 0 th neg rlineto
- pw neg 0 rlineto
- closepath stroke
- grestore
- % stk: ct rt lt
- x v get y v get th sub 1 add moveto
-%%IncludeResource: font Helvetica
- fHelvetica fnfs 0.8 mul scalefont setfont
- % 3. The left title
- gsave
- dup stringwidth pop fnfs 0.8 mul add exch % leave space took on stack
- fnfs 0.8 mul hm rmoveto
- show % left title
- grestore
- exch
- % stk: ct ltw rt
- % 4. the right title
- gsave
- dup stringwidth pop fnfs 0.8 mul add exch % leave space took on stack
- dup
- pw exch stringwidth pop fnfs 0.8 mul add sub
- hm
- rmoveto
- show % right title
- grestore
- % stk: ct ltw rtw
- % 5. the center title
- gsave
- pw 3 1 roll
- % stk: ct pw ltw rtw
- 3 copy
- % Move to the center of the left room
- sub add 2 div hm rmoveto
- % What is the available space in here?
- add sub fnfs 0.8 mul sub fnfs 0.8 mul sub
- % stk: ct space_left
-%%IncludeResource: font Helvetica-Bold
- fHelvetica-Bold fnfs scalefont setfont
- cfshow
- grestore
-} bind def
-
-% Function border: prints virtual page border
-/border { %def
- gsave % print four sides
- 0 setgray
- x v get y v get moveto
- 0.7 setlinewidth % of the square
- pw 0 rlineto
- 0 ph neg rlineto
- pw neg 0 rlineto
- closepath stroke
- grestore
-} bind def
-
-% Function water: prints a water mark in background
-/water { %def
- gsave
- scx scy moveto rotate
-%%IncludeResource: font Times-Bold
- fTimes-Bold 100 scalefont setfont
- .97 setgray
- dup stringwidth pop 2 div neg -50 rmoveto
- show
- grestore
-} bind def
-
-% Function rhead: prints the right header
-/rhead { %def
- lx ly moveto
- fHelvetica fnfs 0.8 mul scalefont setfont
- l-show
-} bind def
-
-% Function footer (cf rf lf -> -)
-/footer {
- fHelvetica fnfs 0.8 mul scalefont setfont
- dx dy moveto
- show
-
- snx sny moveto
- l-show
-
- fnx fny moveto
- c-show
-} bind def
-%%EndResource
-%%BeginResource: procset a2ps-black+white-Prolog 2.0 1
-
-% Function T(ab), jumps to the n-th tabulation in the current line
-/T {
- cw mul x0 add y0 moveto
-} bind def
-
-% Function n: move to the next line
-/n { %def
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-% Function N: show and move to the next line
-/N {
- Show
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-/S {
- Show
-} bind def
-
-/p {
- false UL
- false BX
- fCourier bfs scalefont setfont
- Show
-} bind def
-
-/sy {
- false UL
- false BX
- fSymbol bfs scalefont setfont
- Show
-} bind def
-
-/k {
- false UL
- false BX
- fCourier-Oblique bfs scalefont setfont
- Show
-} bind def
-
-/K {
- false UL
- false BX
- fCourier-Bold bfs scalefont setfont
- Show
-} bind def
-
-/c {
- false UL
- false BX
- fCourier-Oblique bfs scalefont setfont
- Show
-} bind def
-
-/C {
- false UL
- false BX
- fCourier-BoldOblique bfs scalefont setfont
- Show
-} bind def
-
-/l {
- false UL
- false BX
- fHelvetica bfs scalefont setfont
- Show
-} bind def
-
-/L {
- false UL
- false BX
- fHelvetica-Bold bfs scalefont setfont
- Show
-} bind def
-
-/str{
- false UL
- false BX
- fTimes-Roman bfs scalefont setfont
- Show
-} bind def
-
-/e{
- false UL
- true BX
- fHelvetica-Bold bfs scalefont setfont
- Show
-} bind def
-
-%%EndResource
-%%EndProlog
-%%BeginSetup
-%%IncludeResource: font Courier
-%%IncludeResource: font Courier-Oblique
-%%IncludeResource: font Courier-Bold
-%%IncludeResource: font Times-Roman
-%%IncludeResource: font Symbol
-%%IncludeResource: font Courier-BoldOblique
-%%BeginResource: encoding ISO-8859-1Encoding
-/ISO-8859-1Encoding [
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-/parenleft /parenright /asterisk /plus /comma /minus /period /slash
-/zero /one /two /three /four /five /six /seven
-/eight /nine /colon /semicolon /less /equal /greater /question
-/at /A /B /C /D /E /F /G
-/H /I /J /K /L /M /N /O
-/P /Q /R /S /T /U /V /W
-/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-/quoteleft /a /b /c /d /e /f /g
-/h /i /j /k /l /m /n /o
-/p /q /r /s /t /u /v /w
-/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/space /exclamdown /cent /sterling /currency /yen /brokenbar /section
-/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron
-/degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /bullet
-/cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-/Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-/Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-/agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-/egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
-/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-%%EndResource
-% Initialize page description variables.
-/sh 612 def
-/sw 792 def
-/llx 24 def
-/urx 768 def
-/ury 588 def
-/lly 24 def
-/#copies 1 def
-/th 15.000000 def
-/fnfs 11 def
-/bfs 7.493857 def
-/cw 4.496314 def
-
-% Dictionary for ISO-8859-1 support
-/iso1dict 8 dict begin
- /fCourier ISO-8859-1Encoding /Courier reencode_font
- /fCourier-Bold ISO-8859-1Encoding /Courier-Bold reencode_font
- /fCourier-BoldOblique ISO-8859-1Encoding /Courier-BoldOblique reencode_font
- /fCourier-Oblique ISO-8859-1Encoding /Courier-Oblique reencode_font
- /fHelvetica ISO-8859-1Encoding /Helvetica reencode_font
- /fHelvetica-Bold ISO-8859-1Encoding /Helvetica-Bold reencode_font
- /fTimes-Bold ISO-8859-1Encoding /Times-Bold reencode_font
- /fTimes-Roman ISO-8859-1Encoding /Times-Roman reencode_font
-currentdict end def
-/bgcolor [ 0 0 0 ] def
-/bg false def
-/ul false def
-/bx false def
-% The font for line numbering
-/f# /Helvetica findfont bfs .6 mul scalefont def
-/fSymbol /Symbol findfont def
-/hm fnfs 0.25 mul def
-/pw
- cw 81.400000 mul
-def
-/ph
- 522.321860 th add
-def
-/pmw urx llx sub pw 2 mul sub 1 div def
-/pmh 0 def
-/v 0 def
-/x [
- 0
- dup pmw add pw add
-] def
-/y [
- pmh ph add 0 mul ph add
- dup
-] def
-/scx sw 2 div def
-/scy sh 2 div def
-/snx urx def
-/sny lly 2 add def
-/dx llx def
-/dy sny def
-/fnx scx def
-/fny dy def
-/lx snx def
-/ly ury fnfs 0.8 mul sub def
-/sx 0 def
-/tab 8 def
-/x0 0 def
-/y0 0 def
-%%EndSetup
-
-%%Page: (1) 1
-%%BeginPageSetup
-/pagesave save def
-sh 0 translate 90 rotate
-%%EndPageSetup
-iso1dict begin
-gsave
-llx lly 12 add translate
-/v 0 store
-/x0 x v get 3.147420 add sx cw mul add store
-/y0 y v get bfs th add sub store
-x0 y0 moveto
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%) p n
-(%%%%%%%%% Reaction file for 11Li\(d,3He\)10He reaction %%%%%%%%%) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%) N
-(%%Beam energy given in MeV ; Excitation in MeV) N
-(Transfert) N
-() S 8 T (Beam= 60Fe) N
-() S 8 T (Target= 2H) N
-() S 8 T (Light= 1H) N
-() S 8 T (Heavy= 61Fe) N
-() S 8 T (ExcitationEnergy= 2.0) N
-() S 8 T (BeamEnergy= 800) N
-() S 8 T (BeamEnergySpread= 0) N
-() S 8 T (BeamFWHMX= 0.6232) N
-() S 8 T (BeamFWHMY= 0.9069) N
-() S 8 T (BeamSpreadX= 0) N
-() S 8 T (CrossSectionPath= ni69_g7_01.n) N
-() S 8 T (ShootLight= 1) N
-() S 8 T (ShootHeavy= 0) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%) N
-() N
-(60Fe.reaction) (Page 1/1) (May 26, 09 12:13) title
-border
-grestore
-(Printed by Nicolas de S\303\251r\303\251ville) rhead
-(60Fe.reaction) (1/1) (Tuesday June 16, 2009) footer
-end % of iso1dict
-pagesave restore
-showpage
-
-%%Trailer
-end
-%%EOF
diff --git a/Inputs/EventGenerator/60Fe.reaction2.eps b/Inputs/EventGenerator/60Fe.reaction2.eps
deleted file mode 100644
index b6b041300..000000000
--- a/Inputs/EventGenerator/60Fe.reaction2.eps
+++ /dev/null
@@ -1,646 +0,0 @@
-%!PS-Adobe-3.0
-%%Title: 60Fe.reaction
-%%For: Nicolas de Séréville
-%%Creator: a2ps version 4.14
-%%CreationDate: Tue Jun 16 13:24:05 2009
-%%BoundingBox: 24 24 588 768
-%%DocumentData: Clean7Bit
-%%Orientation: Portrait
-%%Pages: 1
-%%PageOrder: Ascend
-%%DocumentMedia: Letter 612 792 0 () ()
-%%DocumentNeededResources: font Courier
-%%+ font Courier-Bold
-%%+ font Courier-BoldOblique
-%%+ font Courier-Oblique
-%%+ font Helvetica
-%%+ font Helvetica-Bold
-%%+ font Symbol
-%%+ font Times-Bold
-%%+ font Times-Roman
-%%DocumentProcessColors: Black
-%%DocumentSuppliedResources: procset a2ps-a2ps-hdr
-%%+ procset a2ps-black+white-Prolog
-%%+ encoding ISO-8859-1Encoding
-%%EndComments
-/a2psdict 200 dict def
-a2psdict begin
-%%BeginProlog
-%%Copyright: (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
-%%Copyright: (c) 1995, 96, 97, 98 Akim Demaille, Miguel Santana
-% Check PostScript language level.
-/languagelevel where {
- pop /gs_languagelevel languagelevel def
-} {
- /gs_languagelevel 1 def
-} ifelse
-
-% EPSF import as in the Red Book
-/BeginInclude {
- /b4_Inc_state save def % Save state for cleanup
- /dict_count countdictstack def % Count objects on dict stack
- /op_count count 1 sub def % Count objects on operand stack
- userdict begin
- 0 setgray 0 setlinecap
- 1 setlinewidth 0 setlinejoin
- 10 setmiterlimit [ ] 0 setdash newpath
- gs_languagelevel 1 ne {
- false setstrokeadjust false setoverprint
- } if
-} bind def
-
-/EndInclude {
- count op_count sub { pos } repeat % Clean up stacks
- countdictstack dict_count sub { end } repeat
- b4_Inc_state restore
-} bind def
-
-/BeginEPSF {
- BeginInclude
- /showpage { } def
-} bind def
-
-/EndEPSF {
- EndInclude
-} bind def
-
-% Page prefeed
-/page_prefeed { % bool -> -
- statusdict /prefeed known {
- statusdict exch /prefeed exch put
- } {
- pop
- } ifelse
-} bind def
-
-/deffont {
- findfont exch scalefont def
-} bind def
-
-/reencode_font {
- findfont reencode 2 copy definefont pop def
-} bind def
-
-% Function c-show (str => -)
-% centers text only according to x axis.
-/c-show {
- dup stringwidth pop
- 2 div neg 0 rmoveto
- show
-} bind def
-
-% Function l-show (str => -)
-% prints texts so that it ends at currentpoint
-/l-show {
- dup stringwidth pop neg
- 0
- rmoveto show
-} bind def
-
-% center-fit show (str w => -)
-% show centered, and scale currentfont so that the width is less than w
-/cfshow {
- exch dup stringwidth pop
- % If the title is too big, try to make it smaller
- 3 2 roll 2 copy
- gt
- { % if, i.e. too big
- exch div
- currentfont exch scalefont setfont
- } { % ifelse
- pop pop
- }
- ifelse
- c-show % center title
-} bind def
-
-% Return the y size of the current font
-% - => fontsize
-/currentfontsize {
- currentfont /FontMatrix get 3 get 1000 mul
-} bind def
-
-% reencode the font
-% <encoding-vector> <fontdict> -> <newfontdict>
-/reencode { %def
- dup length 5 add dict begin
- { %forall
- % <vector> <key> <val>
- 1 index /FID ne
- { def }{ pop pop } ifelse
- } forall
- /Encoding exch def % -
-
- % Use the font's bounding box to determine the ascent, descent,
- % and overall height; don't forget that these values have to be
- % transformed using the font's matrix.
- % We use `load' because sometimes BBox is executable, sometimes not.
- % Since we need 4 numbers an not an array avoid BBox from being executed
- /FontBBox load aload pop
- FontMatrix transform /Ascent exch def pop
- FontMatrix transform /Descent exch def pop
- /FontHeight Ascent Descent sub def
-
- % Get the underline position and thickness if they're defined.
- % Use 1 if they are not defined.
- currentdict /FontInfo 2 copy known
- { get
- /UnderlinePosition 2 copy % <FontInfo> /UP <FontInfo> /UP
- 2 copy known
- { get }{ pop pop 1 } ifelse
- 0 exch FontMatrix transform exch pop
- def % <FontInfo>
-
- /UnderlineThickness 2 copy % <FontInfo> /UT <FontInfo> /UT
- 2 copy known
- { get }{ pop pop 1 } ifelse
- 0 exch FontMatrix transform exch pop
- def % <FontInfo>
- pop % -
- }{ pop pop
- } ifelse
-
- currentdict
- end
-} bind def
-
-% Function print line number (<string> # -)
-/# {
- gsave
- sx cw mul neg 2 div 0 rmoveto
- f# setfont
- c-show
- grestore
-} bind def
-
-% -------- Some routines to enlight plain b/w printings ---------
-
-% Underline
-% width --
-/dounderline {
- currentpoint
- gsave
- moveto
- 0 currentfont /Descent get currentfontsize mul rmoveto
- 0 rlineto
- stroke
- grestore
-} bind def
-
-% Underline a string
-% string --
-/dounderlinestring {
- stringwidth pop
- dounderline
-} bind def
-
-/UL {
- /ul exch store
-} bind def
-
-% Draw a box of WIDTH wrt current font
-% width --
-/dobox {
- currentpoint
- gsave
- newpath
- moveto
- 0 currentfont /Descent get currentfontsize mul rmoveto
- dup 0 rlineto
- 0 currentfont /FontHeight get currentfontsize mul rlineto
- neg 0 rlineto
- closepath
- stroke
- grestore
-} bind def
-
-/BX {
- /bx exch store
-} bind def
-
-% Box a string
-% string --
-/doboxstring {
- stringwidth pop
- dobox
-} bind def
-
-%
-% ------------- Color routines ---------------
-%
-/FG /setrgbcolor load def
-
-% Draw the background
-% width --
-/dobackground {
- currentpoint
- gsave
- newpath
- moveto
- 0 currentfont /Descent get currentfontsize mul rmoveto
- dup 0 rlineto
- 0 currentfont /FontHeight get currentfontsize mul rlineto
- neg 0 rlineto
- closepath
- bgcolor aload pop setrgbcolor
- fill
- grestore
-} bind def
-
-% Draw bg for a string
-% string --
-/dobackgroundstring {
- stringwidth pop
- dobackground
-} bind def
-
-
-/BG {
- dup /bg exch store
- { mark 4 1 roll ] /bgcolor exch store } if
-} bind def
-
-
-/Show {
- bg { dup dobackgroundstring } if
- ul { dup dounderlinestring } if
- bx { dup doboxstring } if
- show
-} bind def
-
-% Function T(ab), jumps to the n-th tabulation in the current line
-/T {
- cw mul x0 add
- bg { dup currentpoint pop sub dobackground } if
- ul { dup currentpoint pop sub dounderline } if
- bx { dup currentpoint pop sub dobox } if
- y0 moveto
-} bind def
-
-% Function n: move to the next line
-/n {
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-% Function N: show and move to the next line
-/N {
- Show
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-/S {
- Show
-} bind def
-
-%%BeginResource: procset a2ps-a2ps-hdr 2.0 2
-%%Copyright: (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
-%%Copyright: (c) 1995, 96, 97, 98 Akim Demaille, Miguel Santana
-% Function title: prints page header.
-% <ct> <rt> <lt> are passed as argument
-/title {
- % 1. Draw the background
- x v get y v get moveto
- gsave
- 0 th 2 div neg rmoveto
- th setlinewidth
- 0.95 setgray
- pw 0 rlineto stroke
- grestore
- % 2. Border it
- gsave
- 0.7 setlinewidth
- pw 0 rlineto
- 0 th neg rlineto
- pw neg 0 rlineto
- closepath stroke
- grestore
- % stk: ct rt lt
- x v get y v get th sub 1 add moveto
-%%IncludeResource: font Helvetica
- fHelvetica fnfs 0.8 mul scalefont setfont
- % 3. The left title
- gsave
- dup stringwidth pop fnfs 0.8 mul add exch % leave space took on stack
- fnfs 0.8 mul hm rmoveto
- show % left title
- grestore
- exch
- % stk: ct ltw rt
- % 4. the right title
- gsave
- dup stringwidth pop fnfs 0.8 mul add exch % leave space took on stack
- dup
- pw exch stringwidth pop fnfs 0.8 mul add sub
- hm
- rmoveto
- show % right title
- grestore
- % stk: ct ltw rtw
- % 5. the center title
- gsave
- pw 3 1 roll
- % stk: ct pw ltw rtw
- 3 copy
- % Move to the center of the left room
- sub add 2 div hm rmoveto
- % What is the available space in here?
- add sub fnfs 0.8 mul sub fnfs 0.8 mul sub
- % stk: ct space_left
-%%IncludeResource: font Helvetica-Bold
- fHelvetica-Bold fnfs scalefont setfont
- cfshow
- grestore
-} bind def
-
-% Function border: prints virtual page border
-/border { %def
- gsave % print four sides
- 0 setgray
- x v get y v get moveto
- 0.7 setlinewidth % of the square
- pw 0 rlineto
- 0 ph neg rlineto
- pw neg 0 rlineto
- closepath stroke
- grestore
-} bind def
-
-% Function water: prints a water mark in background
-/water { %def
- gsave
- scx scy moveto rotate
-%%IncludeResource: font Times-Bold
- fTimes-Bold 100 scalefont setfont
- .97 setgray
- dup stringwidth pop 2 div neg -50 rmoveto
- show
- grestore
-} bind def
-
-% Function rhead: prints the right header
-/rhead { %def
- lx ly moveto
- fHelvetica fnfs 0.8 mul scalefont setfont
- l-show
-} bind def
-
-% Function footer (cf rf lf -> -)
-/footer {
- fHelvetica fnfs 0.8 mul scalefont setfont
- dx dy moveto
- show
-
- snx sny moveto
- l-show
-
- fnx fny moveto
- c-show
-} bind def
-%%EndResource
-%%BeginResource: procset a2ps-black+white-Prolog 2.0 1
-
-% Function T(ab), jumps to the n-th tabulation in the current line
-/T {
- cw mul x0 add y0 moveto
-} bind def
-
-% Function n: move to the next line
-/n { %def
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-% Function N: show and move to the next line
-/N {
- Show
- /y0 y0 bfs sub store
- x0 y0 moveto
-} bind def
-
-/S {
- Show
-} bind def
-
-/p {
- false UL
- false BX
- fCourier bfs scalefont setfont
- Show
-} bind def
-
-/sy {
- false UL
- false BX
- fSymbol bfs scalefont setfont
- Show
-} bind def
-
-/k {
- false UL
- false BX
- fCourier-Oblique bfs scalefont setfont
- Show
-} bind def
-
-/K {
- false UL
- false BX
- fCourier-Bold bfs scalefont setfont
- Show
-} bind def
-
-/c {
- false UL
- false BX
- fCourier-Oblique bfs scalefont setfont
- Show
-} bind def
-
-/C {
- false UL
- false BX
- fCourier-BoldOblique bfs scalefont setfont
- Show
-} bind def
-
-/l {
- false UL
- false BX
- fHelvetica bfs scalefont setfont
- Show
-} bind def
-
-/L {
- false UL
- false BX
- fHelvetica-Bold bfs scalefont setfont
- Show
-} bind def
-
-/str{
- false UL
- false BX
- fTimes-Roman bfs scalefont setfont
- Show
-} bind def
-
-/e{
- false UL
- true BX
- fHelvetica-Bold bfs scalefont setfont
- Show
-} bind def
-
-%%EndResource
-%%EndProlog
-%%BeginSetup
-%%IncludeResource: font Courier
-%%IncludeResource: font Courier-Oblique
-%%IncludeResource: font Courier-Bold
-%%IncludeResource: font Times-Roman
-%%IncludeResource: font Symbol
-%%IncludeResource: font Courier-BoldOblique
-%%BeginResource: encoding ISO-8859-1Encoding
-/ISO-8859-1Encoding [
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-/parenleft /parenright /asterisk /plus /comma /minus /period /slash
-/zero /one /two /three /four /five /six /seven
-/eight /nine /colon /semicolon /less /equal /greater /question
-/at /A /B /C /D /E /F /G
-/H /I /J /K /L /M /N /O
-/P /Q /R /S /T /U /V /W
-/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-/quoteleft /a /b /c /d /e /f /g
-/h /i /j /k /l /m /n /o
-/p /q /r /s /t /u /v /w
-/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/space /exclamdown /cent /sterling /currency /yen /brokenbar /section
-/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron
-/degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /bullet
-/cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
-/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
-/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
-/Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
-/Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
-/agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
-/egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
-/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
-/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
-] def
-%%EndResource
-% Initialize page description variables.
-/sh 792 def
-/sw 612 def
-/llx 24 def
-/urx 588 def
-/ury 768 def
-/lly 24 def
-/#copies 1 def
-/th 20.000000 def
-/fnfs 15 def
-/bfs 11.547912 def
-/cw 6.928747 def
-
-% Dictionary for ISO-8859-1 support
-/iso1dict 8 dict begin
- /fCourier ISO-8859-1Encoding /Courier reencode_font
- /fCourier-Bold ISO-8859-1Encoding /Courier-Bold reencode_font
- /fCourier-BoldOblique ISO-8859-1Encoding /Courier-BoldOblique reencode_font
- /fCourier-Oblique ISO-8859-1Encoding /Courier-Oblique reencode_font
- /fHelvetica ISO-8859-1Encoding /Helvetica reencode_font
- /fHelvetica-Bold ISO-8859-1Encoding /Helvetica-Bold reencode_font
- /fTimes-Bold ISO-8859-1Encoding /Times-Bold reencode_font
- /fTimes-Roman ISO-8859-1Encoding /Times-Roman reencode_font
-currentdict end def
-/bgcolor [ 0 0 0 ] def
-/bg false def
-/ul false def
-/bx false def
-% The font for line numbering
-/f# /Helvetica findfont bfs .6 mul scalefont def
-/fSymbol /Symbol findfont def
-/hm fnfs 0.25 mul def
-/pw
- cw 81.400000 mul
-def
-/ph
- 689.410325 th add
-def
-/pmw 0 def
-/pmh 0 def
-/v 0 def
-/x [
- 0
-] def
-/y [
- pmh ph add 0 mul ph add
-] def
-/scx sw 2 div def
-/scy sh 2 div def
-/snx urx def
-/sny lly 2 add def
-/dx llx def
-/dy sny def
-/fnx scx def
-/fny dy def
-/lx snx def
-/ly ury fnfs 0.8 mul sub def
-/sx 0 def
-/tab 8 def
-/x0 0 def
-/y0 0 def
-%%EndSetup
-
-%%Page: (1) 1
-%%BeginPageSetup
-/pagesave save def
-%%EndPageSetup
-iso1dict begin
-gsave
-llx lly 12 add translate
-/v 0 store
-/x0 x v get 4.850123 add sx cw mul add store
-/y0 y v get bfs th add sub store
-x0 y0 moveto
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%) p n
-(%%%%%%%%% Reaction file for 11Li\(d,3He\)10He reaction %%%%%%%%%) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%) N
-(%%Beam energy given in MeV ; Excitation in MeV) N
-(Transfert) N
-() S 8 T (Beam= 60Fe) N
-() S 8 T (Target= 2H) N
-() S 8 T (Light= 1H) N
-() S 8 T (Heavy= 61Fe) N
-() S 8 T (ExcitationEnergy= 2.0) N
-() S 8 T (BeamEnergy= 800) N
-() S 8 T (BeamEnergySpread= 0) N
-() S 8 T (BeamFWHMX= 0.6232) N
-() S 8 T (BeamFWHMY= 0.9069) N
-() S 8 T (BeamSpreadX= 0) N
-() S 8 T (CrossSectionPath= ni69_g7_01.n) N
-() S 8 T (ShootLight= 1) N
-() S 8 T (ShootHeavy= 0) N
-(%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%) N
-() N
-(60Fe.reaction) (Page 1/1) (May 26, 09 12:13) title
-border
-grestore
-(Printed by Nicolas de S\303\251r\303\251ville) rhead
-() (1/1) (Tuesday June 16, 2009) footer
-end % of iso1dict
-pagesave restore
-showpage
-
-%%Trailer
-end
-%%EOF
diff --git a/NPAnalysis/Gaspard/include/ObjectManager.hh b/NPAnalysis/Gaspard/include/ObjectManager.hh
index f7aa582ee..87249677a 100644
--- a/NPAnalysis/Gaspard/include/ObjectManager.hh
+++ b/NPAnalysis/Gaspard/include/ObjectManager.hh
@@ -7,7 +7,6 @@
// NPA
#include "DetectorManager.hh"
-#include "Must2Array.h"
#include "GaspardTracker.h"
// STL C++
@@ -32,6 +31,7 @@
#include "NPReaction.h"
#include "RootInput.h"
#include "RootOutput.h"
+#include "TInteractionCoordinates.h"
// Use CLHEP System of unit and Physical Constant
#include "CLHEP/Units/GlobalSystemOfUnits.h"
diff --git a/NPAnalysis/Gaspard/src/Analysis.cc b/NPAnalysis/Gaspard/src/Analysis.cc
index f3b8bbc88..e8c9037a9 100644
--- a/NPAnalysis/Gaspard/src/Analysis.cc
+++ b/NPAnalysis/Gaspard/src/Analysis.cc
@@ -28,7 +28,7 @@ int main(int argc,char** argv)
// Initialize the detector
DetectorManager* myDetector = new DetectorManager;
- myDetector -> ReadConfigurationFile(detectorfileName);
+ myDetector->ReadConfigurationFile(detectorfileName);
// Attach more branch to the output
double Ex = 0 ; double EE = 0 ; double TT = 0 ; double X = 0 ; double Y = 0 ; int det ;
@@ -44,6 +44,11 @@ int main(int argc,char** argv)
// Get the TChain and treat it
TChain* chain = RootInput:: getInstance() -> GetChain();
+ // Connect TInteractionCoordinates branch
+ TInteractionCoordinates *interCoord = 0;
+ chain->SetBranchAddress("InteractionCoordinates", &interCoord);
+ chain->SetBranchStatus("InteractionCoordinates", 0);
+
// Analysis is here!
int nentries = chain->GetEntries();
cout << "Number of entries to be analysed: " << nentries << endl;
@@ -56,18 +61,33 @@ int main(int argc,char** argv)
myDetector->ClearEventPhysics();
myDetector->BuildPhysicalEvent();
- // Get total energy and coordinates of interaction
- double E = GPDTrack->GetEnergyDeposit();
- TVector3 A = GPDTrack->GetPositionOfInteraction();
-
- // Calculate scattering angle
- double Theta = ThetaCalculation (A ,TVector3(0,0,1));
-
- // Calculate excitatioin energy
- if (E > -1000) Ex = myReaction->ReconstructRelativistic(E, Theta);
- else Ex = -100;
+ // Get total energy
+ double E = GPDTrack->GetEnergyDeposit();
+
+ // if there is a hit in the detector array, treat it.
+ double Theta, ThetaStrip;
+ 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
+ A = GPDTrack->GetPositionOfInteraction();
+ // Calculate scattering angle
+ ThetaStrip = ThetaCalculation (A ,TVector3(0,0,1));
+
+ // Calculate excitation energy
+ if (Theta/deg > 90) {
+ Ex = myReaction->ReconstructRelativistic(E, Theta / rad);
+ }
+ else Ex = -200;
+// Ex = myReaction->ReconstructRelativistic(E, ThetaStrip);
+ }
+ else {
+ Ex = -100;
+ }
- EE = E ; TT = Theta/deg;
+ EE = E ; TT = ThetaStrip/deg;
if (E>-1000) {
X = A . X();
Y = A . Y();
diff --git a/NPLib/GASPARD/TGaspardTrackerPhysics.cxx b/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
index a2babcca2..69340326c 100644
--- a/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
+++ b/NPLib/GASPARD/TGaspardTrackerPhysics.cxx
@@ -124,9 +124,9 @@ void TGaspardTrackerPhysics::BuildPhysicalEvent(TGaspardTrackerData* Data)
// get energy from strips and store it
double EnergyStripFront = Data->GetGPDTrkFirstStageFrontEEnergy(0);
double EnergyStripBack = Data->GetGPDTrkFirstStageBackEEnergy(0);
- double EnergyStrip = 0.5 * (EnergyStripFront + EnergyStripBack);
-// double EnergyStrip = EnergyStripFront;
-// if (EnergyStripBack > EnergyStrip) EnergyStrip = EnergyStripBack;
+// double EnergyStrip = 0.5 * (EnergyStripFront + EnergyStripBack);
+ double EnergyStrip = EnergyStripFront;
+// if (EnergyStripBack > EnergyStrip) EnergyStrip = EnergyStripBack;
FirstStage_E.push_back(EnergyStrip);
double EnergyTot = EnergyStrip;
// get time from strips and store it
diff --git a/NPSimulation/include/GaspardTrackerDummyShape.hh b/NPSimulation/include/GaspardTrackerDummyShape.hh
index c81f4c592..7567c3b19 100644
--- a/NPSimulation/include/GaspardTrackerDummyShape.hh
+++ b/NPSimulation/include/GaspardTrackerDummyShape.hh
@@ -142,9 +142,10 @@ private:
namespace GPDDUMMYSHAPE
{
// Resolution
- const G4double ResoFirstStage = 0 ;// = 52keV of Resolution // Unit is MeV/2.35
-// const G4double ResoFirstStage = 0.022 ;// = 52keV of Resolution // Unit is MeV/2.35
- const G4double ResoSecondStage = 0.055 ;// = 130 keV of resolution // Unit is MeV/2.35
+// const G4double ResoFirstStage = 0 ;// = 52keV of Resolution // Unit is MeV/2.35
+ const G4double ResoFirstStage = 0.022 ;// = 52keV of Resolution // Unit is MeV/2.35
+ const G4double ResoSecondStage = 0 ;// = 130 keV of resolution // Unit is MeV/2.35
+// const G4double ResoSecondStage = 0.055 ;// = 130 keV of resolution // Unit is MeV/2.35
const G4double ResoThirdStage = 0 ;// = 100 keV of resolution // Unit is MeV/2.35
// const G4double ResoThirdStage = 0.043 ;// = 100 kev of resolution // Unit is MeV/2.35
const G4double ResoTimeGpd = 0.212765957 ;// = 500ps // Unit is ns/2.35
@@ -152,12 +153,17 @@ namespace GPDDUMMYSHAPE
// 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 Length = 1.5*cm;
+// const G4double InterStageDistance = 5*mm;
+ // for testing the excitation energy reconstruction
+ const G4double Length = 4*cm;
+ const G4double InterStageDistance = 15*mm;
// First stage
const G4double FirstStageFace = 5.0*cm;
- const G4double FirstStageThickness = 300*micrometer ;
+// const G4double FirstStageThickness = 300*micrometer ;
+ // for testing the excitation energy reconstruction
+ const G4double FirstStageThickness = 1.3*cm;
// Second stage
const G4double SecondStageFace = FirstStageFace;
diff --git a/NPSimulation/src/EventGeneratorTransfert.cc b/NPSimulation/src/EventGeneratorTransfert.cc
index 12a9205e5..059e8f24d 100644
--- a/NPSimulation/src/EventGeneratorTransfert.cc
+++ b/NPSimulation/src/EventGeneratorTransfert.cc
@@ -360,7 +360,8 @@ void EventGeneratorTransfert::GenerateEvent(G4Event* anEvent , G4ParticleGun* pa
G4double Beam_theta = acos(Zdir / sqrt(Xdir*Xdir + Ydir*Ydir + Zdir*Zdir)) * rad;
G4double Beam_phi = atan2(Ydir, Xdir) * rad;
- if (Beam_phi < 0) Beam_phi += 2*pi;
+ if (Beam_phi < 0) Beam_phi += 2*pi;
+ if (Beam_theta < 1e-6) Beam_phi = 0;
// write angles to ROOT file
m_InitConditions->SetICIncidentAngleTheta(Beam_theta / deg);
diff --git a/TODO b/TODO
new file mode 100644
index 000000000..032264a66
--- /dev/null
+++ b/TODO
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Copyright (C) 2009 this file is part of the NPTool Project *
+ * *
+ * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
+ * For the list of contributors see $NPTOOL/Licence/Contributors *
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Original Author: contact address: *
+ * *
+ * Creation Date : 11/09/09 *
+ * Last update : *
+ *---------------------------------------------------------------------------*
+ * Decription: *
+ * This file describes the features we would like to form part of a next *
+ * release *
+ *---------------------------------------------------------------------------*
+ * Comment: *
+ * *
+ * *
+ *****************************************************************************/
+
+TODO for NPTool:
+----------------
+ + Build a dummy detector as a simple example of how NPTool is working
+ + Add documentation
+ + Add a dedicated class to deal with materials (see example from G4 tutorial)
+ + Split physic list and give the possibility to choose which package to use
+ + Add support for messengers
+ + Build NPTool with the Autotool/Automake
+
+
+TODO for AnnularS1 detector:
+----------------------------
+ + Update the way the scorers are dealt to the new way (no more loop in ReadSensitive)
+
+TODO for Gaspard:
+-----------------
+ + Add documentation
+ + Check bug when light and heavy particles are detected in the same event
+ + Improve analysis in order to deal with heterogeneous detector shapes
--
GitLab