diff --git a/.gitignore b/.gitignore
index b8f21f7fc1b55760f6ea505751b81b08b1b745dc..c7240d8b5cb6752c7581e36be09a66923008e1e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ Projects/E805/CUT
 .last_*
 npanalysis
 npreader
+npcalibration
 nponline
 nptool-cleaner
 nptool-installer
diff --git a/Projects/E805/CalibrationAphaTest.txt b/Projects/E805/CalibrationAphaTest.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e152e0f0fce629547b7fb4c0e482119aa0e820a8
--- /dev/null
+++ b/Projects/E805/CalibrationAphaTest.txt
@@ -0,0 +1,12 @@
+CalibrationFilePath
+    ./data/NPRoot/Calibration/CalAlpha_r0388_06+/Cal_Str_X_E_MM1.cal
+    ./data/NPRoot/Calibration/CalAlpha_r0388_06+/Cal_Str_X_E_MM2.cal
+    ./data/NPRoot/Calibration/CalAlpha_r0388_06+/Cal_Str_X_E_MM3.cal
+    ./data/NPRoot/Calibration/CalAlpha_r0388_06+/Cal_Str_X_E_MM4.cal
+    
+    ./data/NPRoot/Calibration/CalAlpha_r0388_06+/Cal_Str_Y_E_MM1.cal
+    ./data/NPRoot/Calibration/CalAlpha_r0388_06+/Cal_Str_Y_E_MM2.cal
+    ./data/NPRoot/Calibration/CalAlpha_r0388_06+/Cal_Str_Y_E_MM3.cal
+    ./data/NPRoot/Calibration/CalAlpha_r0388_06+/Cal_Str_Y_E_MM4.cal
+
+    
\ No newline at end of file
diff --git a/Projects/E805/DetectorConfiguration/CATS_MCR.detector b/Projects/E805/DetectorConfiguration/CATS_MCR.detector
new file mode 100644
index 0000000000000000000000000000000000000000..1b6451b0efd96bb71e808750e56b208b9c0eb1fd
--- /dev/null
+++ b/Projects/E805/DetectorConfiguration/CATS_MCR.detector
@@ -0,0 +1,31 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Target
+ THICKNESS= 3.2 micrometer
+ ANGLE= 0 deg
+ RADIUS=  10 mm
+ MATERIAL= CH2
+ X= 0 mm
+ Y= 0 mm
+ Z= 0 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CATSDetector
+ CATSNumber = 1
+ X1_Y1= 43.16  -42.26  -1587.1 mm
+ X28_Y1= -27.96  -42.26  -1587.1 mm
+ X1_Y28= 43.16  28.86  -1587.1 mm
+ X28_Y28= -27.96 28.86  -1587.1 mm
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CATSDetector
+ CATSNumber = 2
+ X1_Y1= 33.66    -37.06   -1090.1 mm
+ X28_Y1= -37.46  -37.06   -1090.1 mm
+ X1_Y28= 33.66    34.06  -1090.1 mm 
+ X28_Y28= -37.46  34.06   -1090.1 mm
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+MASK
+ MaskNumber = 1
+ Z = -1732.1
+MASK
+ MaskNumber = 2
+ Z = -1235.1
\ No newline at end of file
diff --git a/Projects/E805/DetectorConfiguration/CATS_test.detector b/Projects/E805/DetectorConfiguration/CATS_test.detector
new file mode 100644
index 0000000000000000000000000000000000000000..ace2e859a35e5cd283b722dcae965ecf7328ec2e
--- /dev/null
+++ b/Projects/E805/DetectorConfiguration/CATS_test.detector
@@ -0,0 +1,25 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Target
+ THICKNESS= 3.2 micrometer
+ ANGLE= 0 deg
+ RADIUS=  10 mm
+ MATERIAL= CH2
+ X= 0 mm
+ Y= 0 mm
+ Z= 0 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CATSDetector
+ CATSNumber = 1
+ X1_Y1= 43.34  -42.31  -1587.1 mm
+ X28_Y1= -27.28  -42.31  -1587.1 mm
+ X1_Y28= 43.34  28.81  -1587.1 mm
+ X28_Y28= -27.78 28.81  -1587.1 mm
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CATSDetector
+ CATSNumber = 2
+ X1_Y1= 33.64    -37.88   -1090.1 mm
+ X28_Y1= -37.48  -37.88   -1090.1 mm
+ X1_Y28= 33.64    33.24  -1090.1 mm 
+ X28_Y28= -37.48  33.24   -1090.1 mm
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Projects/E805/DetectorConfiguration/CATS_test_uncal.detector b/Projects/E805/DetectorConfiguration/CATS_test_uncal.detector
new file mode 100644
index 0000000000000000000000000000000000000000..0a901ab69b8000e44ba049697fccdf78002ca987
--- /dev/null
+++ b/Projects/E805/DetectorConfiguration/CATS_test_uncal.detector
@@ -0,0 +1,25 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Target
+ THICKNESS= 3.2 micrometer
+ ANGLE= 0 deg
+ RADIUS=  10 mm
+ MATERIAL= CH2
+ X= 0 mm
+ Y= 0 mm
+ Z= 0 mm
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CATSDetector
+ CATSNumber = 1
+ X1_Y1= 35.56 -35.56 -1587.1 mm
+ X28_Y1= -35.56 -35.56  -1587.1 mm
+ X1_Y28= 35.56 35.56  -1587.1 mm
+ X28_Y28= -35.56 35.56  -1587.1 mm
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CATSDetector
+ CATSNumber = 2
+ X1_Y1= 35.56 -35.56 -1090.1 mm
+ X28_Y1= -35.56 -35.56   -1090.1 mm
+ X1_Y28= 35.56 35.56 -1090.1 mm 
+ X28_Y28= -35.56 35.56   -1090.1 mm
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Projects/E805/DetectorConfiguration/MUST2_E805.detector b/Projects/E805/DetectorConfiguration/MUST2_E805.detector
new file mode 100644
index 0000000000000000000000000000000000000000..f00244eb4e88840bc54404c4a90b6580a62b8678
--- /dev/null
+++ b/Projects/E805/DetectorConfiguration/MUST2_E805.detector
@@ -0,0 +1,53 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Target
+ THICKNESS= 53.5 micrometer
+ ANGLE= 0 deg
+ RADIUS=  15 mm
+ MATERIAL= CH2
+ ANGLE= 0 deg
+ X= 0 mm
+ Y= 0 mm
+ Z= 10 mm
+%%%%%%% Telescope 1 %%%%%%% 		
+M2Telescope  		
+ X1_Y1= 	-13.57	-104.78	299.83 mm
+ X1_Y128= -25.1	    -12.62	328.63 mm
+ X128_Y1= -104.01	-104.85	263.88 mm
+ X128_Y128= -115.53	-12.71	292.67 mm
+ SI= 1		
+ SILI= 0		
+ CSI= 1		
+ VIS= all  
+%%%%%%% Telescope 2 %%%%%%% 		
+M2Telescope  		
+ X1_Y1= -114.9	9.68	291.84 mm
+ X1_Y128= -24.56	9.8	327.88 mm
+ X128_Y1= -103.58	101.8	262.73 mm
+ X128_Y128= 	-13.24	102.09	298.75 mm
+ SI= 1		
+ SILI= 0		
+ CSI= 1		
+ VIS= all  
+
+%%%%%%% Telescope 3 %%%%%%% 		
+M2Telescope  		
+ X1_Y1= 	11.84	101.72	299.05 mm
+ X1_Y128= 23.44	9.68	328.38 mm
+ X128_Y1= 102.16	101.57	263.01 mm
+ X128_Y128= 113.81	9.57	292.3 mm
+ SI= 1		
+ SILI= 0		
+ CSI= 1		
+ VIS= all  
+
+
+%%%%%%% Telescope 4 %%%%%%% 		
+M2Telescope  		
+ X1_Y1= 113.56	-13.18	292.11 mm
+ X1_Y128= 23.23	-13.37	328.15 mm
+ X128_Y1= 102.39	-105.49	263.59 mm
+ X128_Y128= 	12.04	-105.69	299.63 mm
+ SI= 1		
+ SILI= 0		
+ CSI= 1		
+ VIS= all  
diff --git a/Projects/E805/DetectorConfiguration/MUST_source.detector b/Projects/E805/DetectorConfiguration/MUST_source.detector
new file mode 100644
index 0000000000000000000000000000000000000000..a7460262b419337901a295972cb911eb98996992
--- /dev/null
+++ b/Projects/E805/DetectorConfiguration/MUST_source.detector
@@ -0,0 +1,46 @@
+%%%%%%% Telescope 1 %%%%%%% 		
+M2Telescope  		
+ X1_Y1= 	11.84	101.72	299.05 mm
+ X1_Y128= 23.44	9.68	328.38 mm
+ X128_Y1= 102.16	101.57	263.01 mm
+ X128_Y128= 113.81	9.57	292.3 mm
+ SI= 1		
+ SILI= 0		
+ CSI= 1		
+ VIS= all  
+
+%%%%%%% Telescope 2 %%%%%%% 		
+M2Telescope  		
+ X1_Y1= -114.9	9.68	291.84 mm
+ X1_Y128= -24.56	9.8	327.88 mm
+ X128_Y1= -103.58	101.8	262.73 mm
+ X128_Y128= 	-13.24	102.09	298.75 mm
+ SI= 1		
+ SILI= 0		
+ CSI= 1		
+ VIS= all  
+
+
+%%%%%%% Telescope 3 %%%%%%% 		
+M2Telescope  		
+ X1_Y1= 	-13.57	-104.78	299.83 mm
+ X1_Y128= -25.1	    -12.62	328.63 mm
+ X128_Y1= -104.01	-104.85	263.88 mm
+ X128_Y128= -115.53	-12.71	292.67 mm
+ SI= 1		
+ SILI= 0		
+ CSI= 1		
+ VIS= all  
+
+
+
+%%%%%%% Telescope 4 %%%%%%% 		
+M2Telescope  		
+ X1_Y1= 113.56	-13.18	292.11 mm
+ X1_Y128= 23.23	-13.37	328.15 mm
+ X128_Y1= 102.39	-105.49	263.59 mm
+ X128_Y128= 	12.04	-105.69	299.63 mm
+ SI= 1		
+ SILI= 0		
+ CSI= 1		
+ VIS= all  
diff --git a/Projects/E805/DoCalibration/CalibrationAlpha.do b/Projects/E805/DoCalibration/CalibrationAlpha.do
new file mode 100644
index 0000000000000000000000000000000000000000..d3364d79672ce66be8b06d7692bcd8c15238922e
--- /dev/null
+++ b/Projects/E805/DoCalibration/CalibrationAlpha.do
@@ -0,0 +1,51 @@
+%%%%%%% Telescope 1 %%%%%%% 		
+M2Telescope
+ TelescopeNumber= 1
+ Time= 0
+ Energy= 1		
+ CSI= 0
+
+EnergyCalibrationParameters
+ TelescopeNumber= 1
+ XThreshold= 8600
+ YThreshold= 7800
+ AlphaFitType= NoSatellite
+
+%%%%%%% Telescope 2 %%%%%%% 		
+M2Telescope  		
+ TelescopeNumber= 2
+ Time= 0
+ Energy= 1		
+ CSI= 0		
+
+EnergyCalibrationParameters
+ TelescopeNumber= 2
+ XThreshold= 8600
+ YThreshold= 7800
+ AlphaFitType= NoSatellite
+
+%%%%%%% Telescope 3 %%%%%%% 		
+M2Telescope  		
+ TelescopeNumber= 3
+ Time= 0
+ Energy= 1		
+ CSI= 0		
+
+EnergyCalibrationParameters
+ TelescopeNumber= 3
+ XThreshold= 8600
+ YThreshold= 7800
+ AlphaFitType= NoSatellite
+
+%%%%%%% Telescope 4 %%%%%%% 		
+M2Telescope  		
+ TelescopeNumber= 4
+ Time= 0
+ Energy= 1		
+ CSI= 0		
+
+EnergyCalibrationParameters
+ TelescopeNumber= 4
+ XThreshold= 8600
+ YThreshold= 7800
+ AlphaFitType= NoSatellite
\ No newline at end of file
diff --git a/Projects/E805/DoCalibration/CalibrationCSI.do b/Projects/E805/DoCalibration/CalibrationCSI.do
new file mode 100644
index 0000000000000000000000000000000000000000..d9e78e8e172882e952ee7d0a21ae3939fdf923f9
--- /dev/null
+++ b/Projects/E805/DoCalibration/CalibrationCSI.do
@@ -0,0 +1,51 @@
+%%%%%%% Telescope 1 %%%%%%% 		
+M2Telescope
+ TelescopeNumber= 1
+ Time= 0
+ Energy= 0		
+ CSI= 1
+
+CSICalibrationParameters
+ TelescopeNumber= 1
+ CsIEnergyXThreshold= 8212
+ CsIEnergyYThreshold= 8172
+ CSIEThreshold= 8192
+
+%%%%%%% Telescope 2 %%%%%%% 		
+M2Telescope  		
+ TelescopeNumber= 2
+ Time= 0
+ Energy= 0		
+ CSI= 1		
+
+CSICalibrationParameters
+ TelescopeNumber= 2
+ CsIEnergyXThreshold= 8212
+ CsIEnergyYThreshold= 8172
+ CSIEThreshold= 8192
+
+%%%%%%% Telescope 3 %%%%%%% 		
+M2Telescope
+ TelescopeNumber= 3
+ Time= 0
+ Energy= 0		
+ CSI= 1
+
+CSICalibrationParameters
+ TelescopeNumber= 3
+ CsIEnergyXThreshold= 8212
+ CsIEnergyYThreshold= 8172
+ CSIEThreshold= 8192
+
+%%%%%%% Telescope 4 %%%%%%% 		
+M2Telescope  		
+ TelescopeNumber= 4
+ Time= 0
+ Energy= 0		
+ CSI= 1		
+
+CSICalibrationParameters
+ TelescopeNumber= 4
+ CsIEnergyXThreshold= 8212
+ CsIEnergyYThreshold= 8172
+ CSIEThreshold= 8192
diff --git a/Projects/E805/project.config b/Projects/E805/project.config
new file mode 100644
index 0000000000000000000000000000000000000000..e7d7ae93f84611521fd60633b734e74b87245043
--- /dev/null
+++ b/Projects/E805/project.config
@@ -0,0 +1,7 @@
+Project E805
+ AnalysisOutput= ./data/NPRoot/Analysis/
+ SimulationOutput= ./data/NPRoot/Simulation/
+ EnergyLoss= ../../Inputs/EnergyLoss/
+ CalibrationOutput= ./data/NPRoot/Calibration/
+
+