diff --git a/Inputs/DetectorConfiguration/10cm.detector b/Inputs/DetectorConfiguration/10cm.detector
deleted file mode 100644
index 7b1e6036fc0242b97f3a813785de0ea857afc27b..0000000000000000000000000000000000000000
--- a/Inputs/DetectorConfiguration/10cm.detector
+++ /dev/null
@@ -1,64 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-MUST2Array
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-M2Telescope
-	THETA= 18
-	PHI= 0
-	R= 210
-	BETA= 0 -15 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-M2Telescope
-	THETA= -18
-	PHI= -0
-	R= 210
-	BETA= 0 15 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-M2Telescope
-	THETA= 40
-	PHI= 90
-	R= 90
-	BETA= 5 -0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-M2Telescope
-	THETA= -40
-	PHI= 90
-	R= 90
-	BETA= -5 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%M2Telescope
-	THETA= 0.01
-	PHI= 0.01
-	R= 320
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%M2Telescope
-	THETA= 75
-	PHI= 0.01
-	R= 90
-	BETA= 0 20 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Inputs/DetectorConfiguration/12cm.detector b/Inputs/DetectorConfiguration/12cm.detector
deleted file mode 100644
index 18605c6d520d7ab98d8c7d1b54a1883c253c86c5..0000000000000000000000000000000000000000
--- a/Inputs/DetectorConfiguration/12cm.detector
+++ /dev/null
@@ -1,107 +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
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%CryoTarget
-	THICKNESS= 3000
-	RADIUS=	45
-	TEMPERATURE= 26
-	PRESSURE= 1
-	MATERIAL= D2	
-	WINDOWSTHICKNESS= 8
-	WINDOWSMATERIAL= Mylar
-%%%%%%%%%%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= 35
-	PHI= 43
-	R= 130
-	BETA= 0 -0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-M2Telescope
-	THETA= 35
-	PHI= -43
-	R= 130
-	BETA= 0 -0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
-M2Telescope
-	THETA= -32
-	PHI= 42
-	R= 150
-	BETA= 0 0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
-	THETA= -32
-	PHI= -42
-	R= 150
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
-%M2Telescope
-	THETA= 0
-	PHI= 0
-	R= 280
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%AddThinSi
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 41
-	PHI= 45
-	R= 114
-	BETA= 0 0 -8
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -41
-	PHI= 45
-	R= 114
-	BETA= 0 0 -8
-	SIDE= left	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 41
-	PHI= -45
-	R= 114
-	BETA= 0 0 8
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -41
-	PHI= -45
-	R= 114
-	BETA= 0 0 8
-	SIDE= left
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Inputs/DetectorConfiguration/15cm.detector b/Inputs/DetectorConfiguration/15cm.detector
deleted file mode 100644
index 79eecdfb164b57878a781a58b3dd413798268328..0000000000000000000000000000000000000000
--- a/Inputs/DetectorConfiguration/15cm.detector
+++ /dev/null
@@ -1,107 +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
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%CryoTarget
-	THICKNESS= 3000
-	RADIUS=	45
-	TEMPERATURE= 26
-	PRESSURE= 1
-	MATERIAL= D2	
-	WINDOWSTHICKNESS= 8
-	WINDOWSMATERIAL= Mylar
-%%%%%%%%%%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= 33
-	PHI= 41
-	R= 150
-	BETA= 0 -0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-M2Telescope
-	THETA= 33
-	PHI= -41
-	R= 150
-	BETA= 0 -0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
-M2Telescope
-	THETA= -33
-	PHI= 41
-	R= 150
-	BETA= 0 0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
-	THETA= -33
-	PHI= -41
-	R= 150
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
-%M2Telescope
-	THETA= 0
-	PHI= 0
-	R= 280
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-AddThinSi
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 33
-	PHI= 41
-	R= 110
-	BETA= 0 0 -0
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -33
-	PHI= 41
-	R= 110
-	BETA= 0 0 -0
-	SIDE= left	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 33
-	PHI= -41
-	R= 110
-	BETA= 0 0 0
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -33
-	PHI= -41
-	R= 110
-	BETA= 0 0 0
-	SIDE= left
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Inputs/DetectorConfiguration/17cm.detector b/Inputs/DetectorConfiguration/17cm.detector
deleted file mode 100644
index 5dcc20fb2a175478c01bbf0de489d2c38b3250ba..0000000000000000000000000000000000000000
--- a/Inputs/DetectorConfiguration/17cm.detector
+++ /dev/null
@@ -1,118 +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= 10
-	Y= -10
-	Z= 50
-	
-CryoTarget
-	THICKNESS= 3000
-	RADIUS=	45
-	TEMPERATURE= 26
-	PRESSURE= 1
-	MATERIAL= D2	
-	WINDOWSTHICKNESS= 15
-	WINDOWSMATERIAL= Mylar
-	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= 30
-	PHI= 41
-	R= 170
-	BETA= 0 -0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-M2Telescope
-	THETA= 30
-	PHI= -41
-	R= 170
-	BETA= 0 -0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
-M2Telescope
-	THETA= -30
-	PHI= 41
-	R= 170
-	BETA= 0 0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
-	THETA= -30
-	PHI= -41
-	R= 170
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
-M2Telescope
-	THETA= 0
-	PHI= 0
-	R= 325
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-AddThinSi
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 30
-	PHI= 41
-	R= 110
-	BETA= 0 0 -0
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -30
-	PHI= 41
-	R= 110
-	BETA= 0 0 -0
-	SIDE= left	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 30
-	PHI= -41
-	R= 110
-	BETA= 0 0 0
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -30
-	PHI= -41
-	R= 110
-	BETA= 0 0 0
-	SIDE= left
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Inputs/DetectorConfiguration/20cm.detector b/Inputs/DetectorConfiguration/20cm.detector
deleted file mode 100644
index 686516b97c00e78b5be749d251745b1669a2fa49..0000000000000000000000000000000000000000
--- a/Inputs/DetectorConfiguration/20cm.detector
+++ /dev/null
@@ -1,107 +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
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%CryoTarget
-	THICKNESS= 3000
-	RADIUS=	45
-	TEMPERATURE= 26
-	PRESSURE= 1
-	MATERIAL= D2	
-	WINDOWSTHICKNESS= 8
-	WINDOWSMATERIAL= Mylar
-%%%%%%%%%%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= 27
-	PHI= 42
-	R= 180
-	BETA= 0 -0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-M2Telescope
-	THETA= 27
-	PHI= -42
-	R= 200
-	BETA= 0 -0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
-M2Telescope
-	THETA= -27
-	PHI= 42
-	R= 180
-	BETA= 0 0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
-	THETA= -27
-	PHI= -42
-	R= 200
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
-%M2Telescope
-	THETA= 0
-	PHI= 0
-	R= 280
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%AddThinSi
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 41
-	PHI= 45
-	R= 114
-	BETA= 0 0 -8
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -41
-	PHI= 45
-	R= 114
-	BETA= 0 0 -8
-	SIDE= left	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 41
-	PHI= -45
-	R= 114
-	BETA= 0 0 8
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -41
-	PHI= -45
-	R= 114
-	BETA= 0 0 8
-	SIDE= left
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Inputs/DetectorConfiguration/AnnularS1.detector b/Inputs/DetectorConfiguration/AnnularS1.detector
new file mode 100644
index 0000000000000000000000000000000000000000..2733b1795fc5a8de118ce799e654e055af0cf0da
--- /dev/null
+++ b/Inputs/DetectorConfiguration/AnnularS1.detector
@@ -0,0 +1,7 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%	
+AnnularS1
+        Z=    -158.7
+        RMIN=   24
+        RMAX=   48
+        VIS= all	
+
diff --git a/Inputs/DetectorConfiguration/GOOD_12cm.detector b/Inputs/DetectorConfiguration/GOOD_12cm.detector
deleted file mode 100644
index e09f7e4ed2bbc2a3284c09c5153eacc08f1418b5..0000000000000000000000000000000000000000
--- a/Inputs/DetectorConfiguration/GOOD_12cm.detector
+++ /dev/null
@@ -1,107 +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
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%CryoTarget
-	THICKNESS= 3000
-	RADIUS=	45
-	TEMPERATURE= 26
-	PRESSURE= 1
-	MATERIAL= D2	
-	WINDOWSTHICKNESS= 8
-	WINDOWSMATERIAL= Mylar
-%%%%%%%%%%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= 41
-	PHI= 45
-	R= 120
-	BETA= 0 0 -8
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-M2Telescope
-	THETA= -41
-	PHI= 45
-	R= 120
-	BETA= 0 0 -8
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
-M2Telescope
-	THETA= -41
-	PHI= -45
-	R= 120
-	BETA= 0 0 8
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
-	THETA= 41
-	PHI= -45
-	R= 120
-	BETA= 0 0 8
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%8
-%M2Telescope
-	THETA= 0
-	PHI= 0
-	R= 280
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%AddThinSi
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 41
-	PHI= 45
-	R= 114
-	BETA= 0 0 -8
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -41
-	PHI= 45
-	R= 114
-	BETA= 0 0 -8
-	SIDE= left	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 41
-	PHI= -45
-	R= 114
-	BETA= 0 0 8
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -41
-	PHI= -45
-	R= 114
-	BETA= 0 0 8
-	SIDE= left
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Inputs/DetectorConfiguration/GOOD_2_12cm.detector b/Inputs/DetectorConfiguration/GOOD_2_12cm.detector
deleted file mode 100644
index 02d1d78eca2b73cfc3ec465921ec35587492e924..0000000000000000000000000000000000000000
--- a/Inputs/DetectorConfiguration/GOOD_2_12cm.detector
+++ /dev/null
@@ -1,107 +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
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%CryoTarget
-	THICKNESS= 3000
-	RADIUS=	45
-	TEMPERATURE= 26
-	PRESSURE= 1
-	MATERIAL= D2	
-	WINDOWSTHICKNESS= 8
-	WINDOWSMATERIAL= Mylar
-%%%%%%%%%%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= 37.5
-	PHI= 45
-	R= 120
-	BETA= 0 -0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-M2Telescope
-	THETA= -37.5
-	PHI= 39
-	R= 140
-	BETA= 0 0 -0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
-M2Telescope
-	THETA= -37.5
-	PHI= -39
-	R= 140
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
-	THETA= 37.5
-	PHI= -45
-	R= 120
-	BETA= 0 -0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%8
-%M2Telescope
-	THETA= 0
-	PHI= 0
-	R= 280
-	BETA= 0 0 0
-	SI= 1
-	SILI= 0
-	CSI= 1	
-	VIS= all
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%AddThinSi
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 41
-	PHI= 45
-	R= 114
-	BETA= 0 0 -8
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -41
-	PHI= 45
-	R= 114
-	BETA= 0 0 -8
-	SIDE= left	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= 41
-	PHI= -45
-	R= 114
-	BETA= 0 0 8
-	SIDE= right
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ThinSi
-	THETA= -41
-	PHI= -45
-	R= 114
-	BETA= 0 0 8
-	SIDE= left
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Inputs/DetectorConfiguration/MUST2.detector b/Inputs/DetectorConfiguration/MUST2.detector
new file mode 100644
index 0000000000000000000000000000000000000000..4a7ebad47d22ce1fd369b06a54b37fdfde88b633
--- /dev/null
+++ b/Inputs/DetectorConfiguration/MUST2.detector
@@ -0,0 +1,24 @@
+%%%%%%%%%%%%%%%%%%%%%			
+MUST2Array			
+%%%%%%% Telescope 1 %%%%%%%			
+M2Telescope 			
+X1_Y1=		10.85	105.03	146.16
+X1_Y128=	22.8	9.84	175.95
+X128_Y1=	104.09	105.03	108.76
+X128_Y128=	116.04	9.84	138.55
+SI=	1		
+SILI=	0		
+CSI=	1		
+VIS=	all		
+			
+%%%%%%% Telescope 2 %%%%%%%			
+M2Telescope
+	THETA= -130
+	PHI= 0
+	R= 150
+	BETA= 0 0 0
+	SI= 1
+	SILI= 1
+	CSI= 0
+	VIS= all					
+
diff --git a/Inputs/DetectorConfiguration/Riken1.detector b/Inputs/DetectorConfiguration/Riken1.detector
deleted file mode 100644
index 30f2e3f0ac1ab6e7acc162f304d4bc93198b072c..0000000000000000000000000000000000000000
--- a/Inputs/DetectorConfiguration/Riken1.detector
+++ /dev/null
@@ -1,82 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-GeneralTarget
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%Target
-	THICKNESS= 1
-	RADIUS=	45
-	MATERIAL= CD2
-	X= 10
-	Y= -10
-	Z= 50
-	
-CryoTarget
-	THICKNESS= 3000
-	RADIUS=	45
-	TEMPERATURE= 26
-	PRESSURE= 1
-	MATERIAL= D2	
-	WINDOWSTHICKNESS= 15
-	WINDOWSMATERIAL= Mylar
-	X= 0
-	Y= 0
-	Z= 0			
-%%%%%%%%%%%%%%%%%%%%%			
-MUST2Array			
-%%%%%%% Telescope 1 %%%%%%%			
-M2Telescope 			
-X1_Y1=	10.85	105.03	162.16
-X1_Y128=	22.8	9.84	191.95
-X128_Y1=	104.09	105.03	124.76
-X128_Y128=	116.04	9.84	154.55
-SI=	1		
-SILI=	0		
-CSI=	1		
-VIS=	all		
-			
-%%%%%%% Telescope 2 %%%%%%%			
-M2Telescope 			
-X1_Y1=	-116.04	9.84	154.55
-X1_Y128=	-22.8	9.84	191.95
-X128_Y1=	-104.09	105.03	124.76
-X128_Y128=	-10.85	105.03	162.16
-SI=	1		
-SILI=	0		
-CSI=	1		
-VIS=	all		
-			
-%%%%%%% Telescope 3 %%%%%%%			
-M2Telescope 			
-X1_Y1=	-10.85	-105.03	162.16
-X1_Y128=	-22.8	-9.84	191.95
-X128_Y1=	-104.09	-105.03	124.76
-X128_Y128=	-116.04	-9.84	154.55
-SI=	1		
-SILI=	0		
-CSI=	1		
-VIS=	all		
-			
-%%%%%%% Telescope 4 %%%%%%%			
-M2Telescope 			
-X1_Y1=	116.04	-9.84	154.55
-X1_Y128=	22.8	-9.84	191.95
-X128_Y1=	104.09	-105.03	124.76
-X128_Y128=	10.85	-105.03	162.16
-SI=	1		
-SILI=	0		
-CSI=	1		
-VIS=	all		
-			
-%%%%%%% Telescope 5 %%%%%%%			
-M2Telescope 			
-X1_Y1=	-50.23	-50.23	341
-X1_Y128=	50.23	-50.23	341
-X128_Y1=	-50.23	50.23	341
-X128_Y128=	50.23	50.23	341
-SI=	1		
-SILI=	0		
-CSI=	1		
-VIS=	all		
-			
-%%%%%%%%%%%%%%%%%%%%			
-
-
diff --git a/Inputs/DetectorConfiguration/ThinSi.detector b/Inputs/DetectorConfiguration/ThinSi.detector
new file mode 100644
index 0000000000000000000000000000000000000000..352ff0601de682f39a585712f3183bae144275a2
--- /dev/null
+++ b/Inputs/DetectorConfiguration/ThinSi.detector
@@ -0,0 +1,19 @@
+%%%%%%%%%%%%%%%%%%%%			
+AddThinSi			
+%%%%%%%%% Det 1 %%%%%%%%			
+ThinSi			
+A=	17.61	9.85	104.11
+B=	64.48	9.85	85.31
+C=	58.66	56.29	70.79
+D=	11.79	56.29	89.69
+			
+%%%%%%%%% Det 2 %%%%%%%%			
+ThinSi
+	THETA= 33
+	PHI= -130
+	R= 110
+	BETA= 0 0 -0
+	SIDE= right
+			
+
+
diff --git a/Inputs/DetectorConfiguration/e569.detector b/Inputs/DetectorConfiguration/e569.detector
deleted file mode 100644
index 7860dc649ce9b7856c9570550822b7afc8da070d..0000000000000000000000000000000000000000
--- a/Inputs/DetectorConfiguration/e569.detector
+++ /dev/null
@@ -1,85 +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= 10
-	RADIUS=	15
-	MATERIAL= CD2
-%%%%%%%%%%Detector%%%%%%%%%%%%%%%%%%%
-%%Position and distance given in mm
-%%Angle given in degree
-%%Option: 0.1 for Si SiLi and CSI
-%%Option: all or sensible for VISualisation
-MUST2Array
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
-M2Telescope
-	TL= 104.146 105.098 124.716
-	BL= 116.093 9.902 154.501
-	BR= 22.854 9.902 191.9
-	CT= 63.5 57.5 158.308
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
-M2Telescope
-	TL= -10.907 105.098 162.116
-	BL= -22.854 9.902 191.9
-	BR= -116.093 9.902 154.501
-	CT= -63.5 57.5 158.308
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
-M2Telescope
-	TL= -22.854 -9.902 191.9
-	BL= -10.907 -105.098 162.116
-	BR= -104.146 -105.098 124.716
-	CT= -63.5 -57.5 158.308
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
-	TL= 116.093 -9.902 154.501
-	BL= 104.146 -105.098 124.716
-	BR= 10.907 -105.098 162.116
-	CT= 63.5 -57.5 158.308
-	SI= 1
-	SILI= 0
-	CSI= 1
-	VIS= all
-	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
-M2Telescope
-	TL= 172.96 -110.03 -4.04
-	BL= 146 -110.03 92.82
-	BR= 214.71 -19.4 7.67
-	CT= 180.36 -64.72 50.24
-	SI= 1
-	SILI= 1
-	CSI= 0
-	VIS= all
-	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
-M2Telescope
-	TL=  215.8 -3.7 8
-	BL=  188.9 -3.7 104.8
-	BR=  187.2 92.3 0
-	CT=  188 44.3 52.4
-	SI= 1
-	SILI= 1
-	CSI= 0
-	VIS= all
-	
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
diff --git a/Inputs/DetectorConfiguration/testPerformance.detector b/Inputs/DetectorConfiguration/testPerformance.detector
deleted file mode 100644
index fed3091d0c5f7ea14fae1ac046921b4bbf6f145c..0000000000000000000000000000000000000000
--- 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