From 7881d6f47e8c3916a0e58e6980e2a9aa86f01ac8 Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Thu, 23 Jul 2015 12:17:53 +0100
Subject: [PATCH] * adding e644pd analysis project
---
NPAnalysis/Sharc/Analysis.cxx | 4 +-
NPAnalysis/e644pd/Analysis.cxx | 166 +++++++++++++++++++
NPAnalysis/e644pd/Analysis.h | 79 +++++++++
NPAnalysis/e644pd/CMakeLists.txt | 31 ++++
NPAnalysis/e644pd/Calib/CATS1_X.txt | 58 +++++++
NPAnalysis/e644pd/Calib/CATS1_Y.txt | 58 +++++++
NPAnalysis/e644pd/Calib/CATS1_e644_1_X.txt | 58 +++++++
NPAnalysis/e644pd/Calib/CATS1_e644_1_Y.txt | 58 +++++++
NPAnalysis/e644pd/Calib/CATS2_X.txt | 58 +++++++
NPAnalysis/e644pd/Calib/CATS2_Y.txt | 58 +++++++
NPAnalysis/e644pd/Calib/CATS2_e644_1_X.txt | 58 +++++++
NPAnalysis/e644pd/Calib/CATS2_e644_1_Y.txt | 58 +++++++
NPAnalysis/e644pd/Calib/MUST2_T1_X_Calib.txt | 128 ++++++++++++++
NPAnalysis/e644pd/Calib/MUST2_T1_Y_Calib.txt | 128 ++++++++++++++
NPAnalysis/e644pd/Calib/MUST2_T2_X_Calib.txt | 128 ++++++++++++++
NPAnalysis/e644pd/Calib/MUST2_T2_Y_Calib.txt | 128 ++++++++++++++
NPAnalysis/e644pd/Calib/MUST2_T3_X_Calib.txt | 128 ++++++++++++++
NPAnalysis/e644pd/Calib/MUST2_T3_Y_Calib.txt | 128 ++++++++++++++
NPAnalysis/e644pd/Calib/MUST2_T4_X_Calib.txt | 128 ++++++++++++++
NPAnalysis/e644pd/Calib/MUST2_T4_Y_Calib.txt | 128 ++++++++++++++
NPAnalysis/e644pd/RunToTreat.txt | 5 +
NPAnalysis/e644pd/detector.txt | 60 +++++++
NPLib/Core/NPOptionManager.cxx | 1 +
NPLib/Misc/TTacData.h | 2 +-
NPLib/Misc/TTacPhysics.cxx | 6 +-
NPLib/Sharc/TSharcPhysics.cxx | 10 +-
NPLib/Tiara/TTiaraHyballPhysics.cxx | 13 +-
27 files changed, 1847 insertions(+), 18 deletions(-)
create mode 100644 NPAnalysis/e644pd/Analysis.cxx
create mode 100644 NPAnalysis/e644pd/Analysis.h
create mode 100644 NPAnalysis/e644pd/CMakeLists.txt
create mode 100755 NPAnalysis/e644pd/Calib/CATS1_X.txt
create mode 100755 NPAnalysis/e644pd/Calib/CATS1_Y.txt
create mode 100755 NPAnalysis/e644pd/Calib/CATS1_e644_1_X.txt
create mode 100755 NPAnalysis/e644pd/Calib/CATS1_e644_1_Y.txt
create mode 100755 NPAnalysis/e644pd/Calib/CATS2_X.txt
create mode 100755 NPAnalysis/e644pd/Calib/CATS2_Y.txt
create mode 100755 NPAnalysis/e644pd/Calib/CATS2_e644_1_X.txt
create mode 100755 NPAnalysis/e644pd/Calib/CATS2_e644_1_Y.txt
create mode 100755 NPAnalysis/e644pd/Calib/MUST2_T1_X_Calib.txt
create mode 100755 NPAnalysis/e644pd/Calib/MUST2_T1_Y_Calib.txt
create mode 100755 NPAnalysis/e644pd/Calib/MUST2_T2_X_Calib.txt
create mode 100755 NPAnalysis/e644pd/Calib/MUST2_T2_Y_Calib.txt
create mode 100755 NPAnalysis/e644pd/Calib/MUST2_T3_X_Calib.txt
create mode 100755 NPAnalysis/e644pd/Calib/MUST2_T3_Y_Calib.txt
create mode 100755 NPAnalysis/e644pd/Calib/MUST2_T4_X_Calib.txt
create mode 100755 NPAnalysis/e644pd/Calib/MUST2_T4_Y_Calib.txt
create mode 100755 NPAnalysis/e644pd/RunToTreat.txt
create mode 100755 NPAnalysis/e644pd/detector.txt
diff --git a/NPAnalysis/Sharc/Analysis.cxx b/NPAnalysis/Sharc/Analysis.cxx
index 746ee20af..8d36cdcfe 100644
--- a/NPAnalysis/Sharc/Analysis.cxx
+++ b/NPAnalysis/Sharc/Analysis.cxx
@@ -40,7 +40,7 @@ void Analysis::Init(){
Sharc = (TSharcPhysics*) m_DetectorManager -> GetDetector("Sharc");
LightCD2 = EnergyLoss("proton_CD2.G4table","G4Table",100 );
LightSi = EnergyLoss("proton_Si.G4table","G4Table",100);
- BeamCD2 = EnergyLoss("Mg28[0.0]_CD2.G4table","G4Table",100);
+ BeamCD2 = EnergyLoss("Mg28_CD2.G4table","G4Table",100);
myReaction = new NPL::Reaction();
myReaction->ReadConfigurationFile(NPOptionManager::getInstance()->GetReactionFile());
TargetThickness = m_DetectorManager->GetTargetThickness()*micrometer;
@@ -82,7 +82,7 @@ void Analysis::TreatEvent(){
ThetaSharcSurface = 0;
ThetaNormalTarget = 0;
if(XTarget>-1000 && YTarget>-1000){
- TVector3 HitDirection = Sharc -> GetPositionOfInteraction(0) - BeamImpact ;
+ TVector3 HitDirection = Sharc -> GetPositionOfInteraction(0) ;
ThetaLab = HitDirection.Angle( BeamDirection );
ThetaSharcSurface = HitDirection.Angle( TVector3(0,0,1) ) ;
diff --git a/NPAnalysis/e644pd/Analysis.cxx b/NPAnalysis/e644pd/Analysis.cxx
new file mode 100644
index 000000000..7e575a8a4
--- /dev/null
+++ b/NPAnalysis/e644pd/Analysis.cxx
@@ -0,0 +1,166 @@
+/*****************************************************************************
+ * Copyright (C) 2009-2014 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: Adrien MATTA contact address: a.matta@surrey.ac.uk *
+ * *
+ * Creation Date : march 2025 *
+ * Last update : *
+ *---------------------------------------------------------------------------*
+ * Decription: *
+ * Class describing the property of an Analysis object *
+ * *
+ *---------------------------------------------------------------------------*
+ * Comment: *
+ * *
+ * *
+ *****************************************************************************/
+#include<iostream>
+using namespace std;
+#include"Analysis.h"
+#include"NPAnalysisFactory.h"
+#include"NPDetectorManager.h"
+#include"NPOptionManager.h"
+////////////////////////////////////////////////////////////////////////////////
+Analysis::Analysis(){
+}
+////////////////////////////////////////////////////////////////////////////////
+Analysis::~Analysis(){
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void Analysis::Init(){
+ InitOutputBranch();
+ InitInputBranch();
+
+ M2 = (TMust2Physics*) m_DetectorManager -> GetDetector("MUST2Array");
+ LightCD2 = EnergyLoss("proton_CD2.G4table","G4Table",100 );
+ LightAl = EnergyLoss("proton_Al.G4table","G4Table",100);
+ LightSi = EnergyLoss("proton_Si.G4table","G4Table",100);
+ myReaction = new NPL::Reaction();
+ myReaction->ReadConfigurationFile(NPOptionManager::getInstance()->GetReactionFile());
+ TargetThickness = m_DetectorManager->GetTargetThickness()*micrometer;
+ OriginalBeamEnergy = myReaction->GetBeamEnergy();
+ Rand = TRandom3();
+ DetectorNumber = 0 ;
+ ThetaNormalTarget = 0 ;
+ ThetaM2Surface = 0;
+ Si_E_M2 = 0 ;
+ CsI_E_M2 = 0 ;
+ Energy = 0;
+ E_M2 = 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void Analysis::TreatEvent(){
+ // Reinitiate calculated variable
+ ReInitValue();
+ double XTarget = 0;
+ double YTarget = 0;
+ TVector3 BeamDirection = TVector3(0,0,1);
+ BeamImpact = TVector3(0,0,0);
+ //////////////////////////// LOOP on MUST2 //////////////////
+ for(unsigned int countMust2 = 0 ; countMust2 < M2->Si_E.size() ; countMust2++){
+ /************************************************/
+ //Part 0 : Get the usefull Data
+ // MUST2
+ int TelescopeNumber = M2->TelescopeNumber[countMust2];
+
+ /************************************************/
+ // Part 1 : Impact Angle
+ ThetaM2Surface = 0;
+ ThetaNormalTarget = 0;
+ TVector3 HitDirection = M2 -> GetPositionOfInteraction(countMust2) - BeamImpact ;
+ ThetaLab = HitDirection.Angle( BeamDirection );
+
+ ThetaM2Surface = HitDirection.Angle(- M2 -> GetTelescopeNormal(countMust2) );
+ ThetaNormalTarget = HitDirection.Angle( TVector3(0,0,1) ) ;
+
+ /************************************************/
+
+ /************************************************/
+ // Part 2 : Impact Energy
+ Energy = ELab = 0;
+ Si_E_M2 = M2->Si_E[countMust2];
+ CsI_E_M2= M2->CsI_E[countMust2];
+
+ // if CsI
+ if(CsI_E_M2>0 ){
+ // The energy in CsI is calculate form dE/dx Table because
+ Energy = CsI_E_M2;
+ Energy = LightAl.EvaluateInitialEnergy( Energy ,0.4*micrometer , ThetaM2Surface);
+ Energy+=Si_E_M2;
+ }
+
+ else
+ Energy = Si_E_M2;
+
+ // Evaluate energy using the thickness
+ ELab = LightAl.EvaluateInitialEnergy( Energy ,0.4*micrometer , ThetaM2Surface);
+ // Target Correction
+ ELab = LightCD2.EvaluateInitialEnergy( ELab ,TargetThickness/2., ThetaNormalTarget);
+ /************************************************/
+
+ /************************************************/
+ // Part 3 : Excitation Energy Calculation
+ Ex = myReaction -> ReconstructRelativistic( ELab , ThetaLab );
+ ThetaLab=ThetaLab/deg;
+
+ /************************************************/
+
+ /************************************************/
+ // Part 4 : Theta CM Calculation
+ ThetaCM = myReaction -> EnergyLabToThetaCM( ELab , ThetaLab)/deg;
+ /************************************************/
+ }//end loop MUST2
+
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void Analysis::End(){
+}
+////////////////////////////////////////////////////////////////////////////////
+void Analysis::InitOutputBranch() {
+ RootOutput::getInstance()->GetTree()->Branch("Ex",&Ex,"Ex/D");
+ RootOutput::getInstance()->GetTree()->Branch("ELab",&ELab,"ELab/D");
+ RootOutput::getInstance()->GetTree()->Branch("ThetaLab",&ThetaLab,"ThetaLab/D");
+ RootOutput::getInstance()->GetTree()->Branch("ThetaCM",&ThetaCM,"ThetaCM/D");
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void Analysis::InitInputBranch(){
+}
+////////////////////////////////////////////////////////////////////////////////
+void Analysis::ReInitValue(){
+ Ex = -1000 ;
+ ELab = -1000;
+ ThetaLab = -1000;
+ ThetaCM = -1000;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Construct Method to be pass to the AnalysisFactory //
+////////////////////////////////////////////////////////////////////////////////
+NPL::VAnalysis* Analysis::Construct(){
+ return (NPL::VAnalysis*) new Analysis();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Registering the construct method to the factory //
+////////////////////////////////////////////////////////////////////////////////
+extern "C"{
+class proxy{
+ public:
+ proxy(){
+ NPL::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct);
+ }
+};
+
+proxy p;
+}
+
diff --git a/NPAnalysis/e644pd/Analysis.h b/NPAnalysis/e644pd/Analysis.h
new file mode 100644
index 000000000..f4578a5cd
--- /dev/null
+++ b/NPAnalysis/e644pd/Analysis.h
@@ -0,0 +1,79 @@
+#ifndef Analysis_h
+#define Analysis_h
+/*****************************************************************************
+ * Copyright (C) 2009-2014 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: Adrien MATTA contact address: a.matta@surrey.ac.uk *
+ * *
+ * Creation Date : march 2025 *
+ * Last update : *
+ *---------------------------------------------------------------------------*
+ * Decription: *
+ * Class describing the property of an Analysis object *
+ * *
+ *---------------------------------------------------------------------------*
+ * Comment: *
+ * *
+ * *
+ *****************************************************************************/
+#include"NPVAnalysis.h"
+#include"NPEnergyLoss.h"
+#include"NPReaction.h"
+#include"RootOutput.h"
+#include"RootInput.h"
+#include "TMust2Physics.h"
+#include "TInitialConditions.h"
+#include <TRandom3.h>
+#include <TVector3.h>
+#include <TMath.h>
+
+class Analysis: public NPL::VAnalysis{
+ public:
+ Analysis();
+ ~Analysis();
+
+ public:
+ void Init();
+ void TreatEvent();
+ void End();
+
+ void InitOutputBranch();
+ void InitInputBranch();
+ void ReInitValue();
+ static NPL::VAnalysis* Construct();
+
+ private:
+ double Ex;
+ double ELab;
+ double ThetaLab;
+ double ThetaCM;
+ NPL::Reaction* myReaction;
+ TInitialConditions* myInit ;
+
+ // Energy loss table: the G4Table are generated by the simulation
+ EnergyLoss LightCD2;
+ EnergyLoss LightAl;
+ EnergyLoss LightSi;
+ EnergyLoss BeamCD2;
+ TVector3 BeamImpact;
+
+ double TargetThickness ;
+ // Beam Energy
+ double OriginalBeamEnergy ; // AMEV
+ // intermediate variable
+ TRandom3 Rand ;
+ int DetectorNumber ;
+ double ThetaNormalTarget;
+ double ThetaM2Surface ;
+ double Si_E_M2 ;
+ double CsI_E_M2 ;
+ double Energy ;
+ double E_M2 ;
+ TMust2Physics* M2;
+};
+#endif
diff --git a/NPAnalysis/e644pd/CMakeLists.txt b/NPAnalysis/e644pd/CMakeLists.txt
new file mode 100644
index 000000000..1d6a34417
--- /dev/null
+++ b/NPAnalysis/e644pd/CMakeLists.txt
@@ -0,0 +1,31 @@
+cmake_minimum_required (VERSION 2.8)
+#Finding NPTool
+set(NPTOOL "$ENV{NPTOOL}")
+set(NPLIB "${NPTOOL}/NPLib")
+set(NPTOOL_INCLUDE_DIR "${NPLIB}/include")
+set(NPTOOL_LIB_DIR "${NPLIB}/lib")
+
+include("${NPLIB}/FindROOT.cmake")
+
+project (NPAnalysis)
+set(CMAKE_BUILD_TYPE Release)
+# Add root to the link and include directories
+include_directories( ${ROOT_INCLUDE_DIR})
+link_directories( ${ROOT_LIBRARY_DIR})
+include_directories( ${NPTOOL_INCLUDE_DIR})
+link_directories( ${NPTOOL_LIB_DIR})
+
+# Get the compilator flag from root to assure consistancy
+EXEC_PROGRAM(${ROOT_CONFIG_EXECUTABLE}
+ ARGS "--cflags"
+ OUTPUT_VARIABLE root_cflags )
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${root_cflags}")
+
+# If the compiler is Clang, silence the unrecognised flags
+if(${CMAKE_CXX_COMPILER_ID} MATCHES ".*Clang.*")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -undefined dynamic_lookup")
+endif()
+
+add_library(NPAnalysis SHARED Analysis.cxx)
+target_link_libraries(NPAnalysis ${ROOT_LIBRARIES} -L${NPLIB}/lib -lNPCore -lNPPhysics)
diff --git a/NPAnalysis/e644pd/Calib/CATS1_X.txt b/NPAnalysis/e644pd/Calib/CATS1_X.txt
new file mode 100755
index 000000000..3606f300a
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/CATS1_X.txt
@@ -0,0 +1,58 @@
+CATS_D1_X1_Q 0 0
+CATS_D1_X1 0 6.66667
+CATS_D1_X2_Q -18.3906 1.04124
+CATS_D1_X2 450.45 6.66667
+CATS_D1_X3_Q -118.37 1.05041
+CATS_D1_X3 383.623 6.66667
+CATS_D1_X4_Q 81.5581 1.01226
+CATS_D1_X4 284.418 6.66667
+CATS_D1_X5_Q 232.085 0.930496
+CATS_D1_X5 310.174 6.66667
+CATS_D1_X6_Q 120.869 0.922997
+CATS_D1_X6 285.927 6.66667
+CATS_D1_X7_Q 268.734 1.04614
+CATS_D1_X7 137.634 6.66667
+CATS_D1_X8_Q 218.847 1.0618
+CATS_D1_X8 324.298 6.66667
+CATS_D1_X9_Q -62.1043 0.996651
+CATS_D1_X9 651.207 6.66667
+CATS_D1_X10_Q 10.6062 0.993245
+CATS_D1_X10 519.231 6.66667
+CATS_D1_X11_Q -21.5452 1.06314
+CATS_D1_X11 519.924 6.66667
+CATS_D1_X12_Q 128.252 1.02561
+CATS_D1_X12 608.045 6.66667
+CATS_D1_X13_Q -16.8693 1.00596
+CATS_D1_X13 391.678 6.66667
+CATS_D1_X14_Q 194.908 0.978114
+CATS_D1_X14 293.645 6.66667
+CATS_D1_X15_Q -12.5846 1.03446
+CATS_D1_X15 410.243 6.66667
+CATS_D1_X16_Q 1.3395 0.999884
+CATS_D1_X16 400.017 6.66667
+CATS_D1_X17_Q 127.519 1.13185
+CATS_D1_X17 263.22 6.66667
+CATS_D1_X18_Q 104.238 1.02923
+CATS_D1_X18 541.011 6.66667
+CATS_D1_X19_Q -31.3076 0.976776
+CATS_D1_X19 408.37 6.66667
+CATS_D1_X20_Q 121.62 1.04265
+CATS_D1_X20 445.452 6.66667
+CATS_D1_X21_Q 126.019 0.983039
+CATS_D1_X21 319.555 6.66667
+CATS_D1_X22_Q 147.434 0.960023
+CATS_D1_X22 463.79 6.66667
+CATS_D1_X23_Q 94.7037 0.950461
+CATS_D1_X23 473.462 6.66667
+CATS_D1_X24_Q 152.986 0.993718
+CATS_D1_X24 492.07 6.66667
+CATS_D1_X25_Q 123.663 0.996366
+CATS_D1_X25 284.145 6.66667
+CATS_D1_X26_Q -99.6977 1.03757
+CATS_D1_X26 423.452 6.66667
+CATS_D1_X27_Q -11.468 1.01601
+CATS_D1_X27 383.536 6.66667
+CATS_D1_X28_Q 0 0
+CATS_D1_X28 0 6.66667
+CATS_D1_X29_Q 0 0
+CATS_D1_X29 0 6.66667
diff --git a/NPAnalysis/e644pd/Calib/CATS1_Y.txt b/NPAnalysis/e644pd/Calib/CATS1_Y.txt
new file mode 100755
index 000000000..174439d72
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/CATS1_Y.txt
@@ -0,0 +1,58 @@
+CATS_D1_Y1_Q 0 0
+CATS_D1_Y1 0 6.66667
+CATS_D1_Y2_Q -16.019 0.887494
+CATS_D1_Y2 237.964 6.66667
+CATS_D1_Y3_Q -1.80706 0.889613
+CATS_D1_Y3 242.422 6.66667
+CATS_D1_Y4_Q 5.18717 0.952974
+CATS_D1_Y4 267.024 6.66667
+CATS_D1_Y5_Q 36.6426 0.880667
+CATS_D1_Y5 423.781 6.66667
+CATS_D1_Y6_Q -18.7821 0.970314
+CATS_D1_Y6 233.283 6.66667
+CATS_D1_Y7_Q -4.72148 0.956769
+CATS_D1_Y7 386.712 6.66667
+CATS_D1_Y8_Q -2.41168 0.928958
+CATS_D1_Y8 394.706 6.66667
+CATS_D1_Y9_Q -52.2542 0.914952
+CATS_D1_Y9 387.388 6.66667
+CATS_D1_Y10_Q -13.4299 0.908025
+CATS_D1_Y10 236.947 6.66667
+CATS_D1_Y11_Q -2.43687 0.905593
+CATS_D1_Y11 386.088 6.66667
+CATS_D1_Y12_Q -7.98579 0.8937
+CATS_D1_Y12 284.799 6.66667
+CATS_D1_Y13_Q 10.3259 0.983538
+CATS_D1_Y13 198.665 6.66667
+CATS_D1_Y14_Q 20.1264 0.955874
+CATS_D1_Y14 237.926 6.66667
+CATS_D1_Y15_Q -35.1747 1.00959
+CATS_D1_Y15 240.323 6.66667
+CATS_D1_Y16_Q -1.35202 1.00089
+CATS_D1_Y16 201.613 6.66667
+CATS_D1_Y17_Q 59.9345 0.964842
+CATS_D1_Y17 152.15 6.66667
+CATS_D1_Y18_Q -45.7278 0.906348
+CATS_D1_Y18 387.943 6.66667
+CATS_D1_Y19_Q 6.79128 0.893147
+CATS_D1_Y19 348.289 6.66667
+CATS_D1_Y20_Q -50.3748 0.895989
+CATS_D1_Y20 439.403 6.66667
+CATS_D1_Y21_Q -49.3112 0.862991
+CATS_D1_Y21 304.375 6.66667
+CATS_D1_Y22_Q -57.4219 0.874041
+CATS_D1_Y22 340.913 6.66667
+CATS_D1_Y23_Q -81.9761 0.94699
+CATS_D1_Y23 306.619 6.66667
+CATS_D1_Y24_Q 0.270256 0.903541
+CATS_D1_Y24 400.77 6.66667
+CATS_D1_Y25_Q 1.09153 0.807904
+CATS_D1_Y25 315.184 6.66667
+CATS_D1_Y26_Q -12.7032 0.821632
+CATS_D1_Y26 319.99 6.66667
+CATS_D1_Y27_Q -42.6777 0.871989
+CATS_D1_Y27 402.1 6.66667
+CATS_D1_Y28_Q -12.6487 0.541704
+CATS_D1_Y28 348.299 6.66667
+CATS_D1_Y29_Q -12.6487 0.541704
+CATS_D1_Y29 348.299 6.66667
diff --git a/NPAnalysis/e644pd/Calib/CATS1_e644_1_X.txt b/NPAnalysis/e644pd/Calib/CATS1_e644_1_X.txt
new file mode 100755
index 000000000..3b4325fa2
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/CATS1_e644_1_X.txt
@@ -0,0 +1,58 @@
+CATS_D1_X1_Q 0 0
+CATS_D1_X1 0 30
+CATS_D1_X2_Q -2.27887 0.996582
+CATS_D1_X2 482.243 30
+CATS_D1_X3_Q 0 0
+CATS_D1_X3 0 30
+CATS_D1_X4_Q 92.9443 1.00207
+CATS_D1_X4 298.274 30
+CATS_D1_X5_Q 223.47 0.938276
+CATS_D1_X5 385.821 30
+CATS_D1_X6_Q 137.15 0.91715
+CATS_D1_X6 442.77 30
+CATS_D1_X7_Q 266.997 1.03341
+CATS_D1_X7 280.672 30
+CATS_D1_X8_Q 219.456 1.03852
+CATS_D1_X8 179.783 30
+CATS_D1_X9_Q -54.9102 0.979809
+CATS_D1_X9 553.121 30
+CATS_D1_X10_Q 8.50338 0.977393
+CATS_D1_X10 379.205 30
+CATS_D1_X11_Q -19.5347 1.04694
+CATS_D1_X11 426.144 30
+CATS_D1_X12_Q 127.348 1.00709
+CATS_D1_X12 609.094 30
+CATS_D1_X13_Q -13.4502 0.990513
+CATS_D1_X13 454.329 30
+CATS_D1_X14_Q 194.947 0.961044
+CATS_D1_X14 409.259 30
+CATS_D1_X15_Q -11.386 1.01175
+CATS_D1_X15 423.518 30
+CATS_D1_X16_Q 4.57317 0.999423
+CATS_D1_X16 511.409 30
+CATS_D1_X17_Q 141.871 1.11629
+CATS_D1_X17 424.927 30
+CATS_D1_X18_Q 99.8539 1.02465
+CATS_D1_X18 336.692 30
+CATS_D1_X19_Q -27.9951 0.96404
+CATS_D1_X19 489.473 30
+CATS_D1_X20_Q 123.513 1.03614
+CATS_D1_X20 313.676 30
+CATS_D1_X21_Q 130.061 0.978001
+CATS_D1_X21 387.216 30
+CATS_D1_X22_Q 151.238 0.954499
+CATS_D1_X22 320.916 30
+CATS_D1_X23_Q 99.5267 0.954898
+CATS_D1_X23 341.854 30
+CATS_D1_X24_Q 144.968 1.00058
+CATS_D1_X24 361.525 30
+CATS_D1_X25_Q 127.727 0.999016
+CATS_D1_X25 383.834 30
+CATS_D1_X26_Q -97.7666 1.04056
+CATS_D1_X26 559.508 30
+CATS_D1_X27_Q -9.91928 1.04462
+CATS_D1_X27 532.088 30
+CATS_D1_X28_Q 0 0
+CATS_D1_X28 0 30
+CATS_D1_X29_Q 0 0
+CATS_D1_X29 0 30
diff --git a/NPAnalysis/e644pd/Calib/CATS1_e644_1_Y.txt b/NPAnalysis/e644pd/Calib/CATS1_e644_1_Y.txt
new file mode 100755
index 000000000..33aaf649d
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/CATS1_e644_1_Y.txt
@@ -0,0 +1,58 @@
+CATS_D1_Y1_Q 0 0
+CATS_D1_Y1 0 30
+CATS_D1_Y2_Q -12.1327 0.925595
+CATS_D1_Y2 235.889 30
+CATS_D1_Y3_Q -2.5817 0.924025
+CATS_D1_Y3 263.235 30
+CATS_D1_Y4_Q 13.5631 0.963163
+CATS_D1_Y4 320.611 30
+CATS_D1_Y5_Q 37.1603 0.89586
+CATS_D1_Y5 200.571 30
+CATS_D1_Y6_Q -12.6842 1.01238
+CATS_D1_Y6 260.402 30
+CATS_D1_Y7_Q -0.902265 0.969609
+CATS_D1_Y7 348.958 30
+CATS_D1_Y8_Q -2.17098 0.937975
+CATS_D1_Y8 247.923 30
+CATS_D1_Y9_Q -47.0219 0.920932
+CATS_D1_Y9 312.64 30
+CATS_D1_Y10_Q -8.89928 0.91759
+CATS_D1_Y10 438.146 30
+CATS_D1_Y11_Q 4.44355 0.92831
+CATS_D1_Y11 280.02 30
+CATS_D1_Y12_Q -1.43613 0.902988
+CATS_D1_Y12 255.031 30
+CATS_D1_Y13_Q 7.1441 0.990247
+CATS_D1_Y13 341.075 30
+CATS_D1_Y14_Q 21.5899 0.953014
+CATS_D1_Y14 360.241 30
+CATS_D1_Y15_Q -32.4742 1.00361
+CATS_D1_Y15 370.606 30
+CATS_D1_Y16_Q -1.08296 1.00057
+CATS_D1_Y16 220.036 30
+CATS_D1_Y17_Q 70.1435 0.959592
+CATS_D1_Y17 299.875 30
+CATS_D1_Y18_Q -34.2721 0.891257
+CATS_D1_Y18 358.298 30
+CATS_D1_Y19_Q 7.34465 0.888596
+CATS_D1_Y19 397.994 30
+CATS_D1_Y20_Q -47.4339 0.904406
+CATS_D1_Y20 306.158 30
+CATS_D1_Y21_Q -45.5403 0.856911
+CATS_D1_Y21 330.511 30
+CATS_D1_Y22_Q -15.6697 0.906571
+CATS_D1_Y22 365.881 30
+CATS_D1_Y23_Q -63.3207 0.955982
+CATS_D1_Y23 495.658 30
+CATS_D1_Y24_Q 9.32042 0.890846
+CATS_D1_Y24 371.707 30
+CATS_D1_Y25_Q 0.311798 0.806738
+CATS_D1_Y25 338.66 30
+CATS_D1_Y26_Q -19.6553 0.846503
+CATS_D1_Y26 453.554 30
+CATS_D1_Y27_Q -27.2185 0.845934
+CATS_D1_Y27 395.826 30
+CATS_D1_Y28_Q 8.29572 0.502073
+CATS_D1_Y28 497.624 30
+CATS_D1_Y29_Q 0 0
+CATS_D1_Y29 0 30
diff --git a/NPAnalysis/e644pd/Calib/CATS2_X.txt b/NPAnalysis/e644pd/Calib/CATS2_X.txt
new file mode 100755
index 000000000..405b39fdf
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/CATS2_X.txt
@@ -0,0 +1,58 @@
+CATS_D2_X1_Q 0 0
+CATS_D2_X1 0 6.66667
+CATS_D2_X2_Q 158.998 1.11242
+CATS_D2_X2 371.975 6.66667
+CATS_D2_X3_Q 45.6044 1.07901
+CATS_D2_X3 380.311 6.66667
+CATS_D2_X4_Q 15.9095 1.04917
+CATS_D2_X4 549.149 6.66667
+CATS_D2_X5_Q 45.2544 1.02145
+CATS_D2_X5 412.676 6.66667
+CATS_D2_X6_Q 0.821874 0.976341
+CATS_D2_X6 399.936 6.66667
+CATS_D2_X7_Q 148.916 0.94656
+CATS_D2_X7 468.808 6.66667
+CATS_D2_X8_Q 34.0358 0.971671
+CATS_D2_X8 562.087 6.66667
+CATS_D2_X9_Q -24.9203 1.01289
+CATS_D2_X9 521.65 6.66667
+CATS_D2_X10_Q -10.8353 1.01714
+CATS_D2_X10 407.778 6.66667
+CATS_D2_X11_Q 8.0124 1.00575
+CATS_D2_X11 439.447 6.66667
+CATS_D2_X12_Q 1.88006 1.00362
+CATS_D2_X12 408.848 6.66667
+CATS_D2_X13_Q 42.6393 1.04579
+CATS_D2_X13 509.719 6.66667
+CATS_D2_X14_Q 84.4375 1.01083
+CATS_D2_X14 339.749 6.66667
+CATS_D2_X15_Q 21.0828 1.05714
+CATS_D2_X15 528.872 6.66667
+CATS_D2_X16_Q -1.63805 1.00066
+CATS_D2_X16 487.803 6.66667
+CATS_D2_X17_Q 181.72 1.03646
+CATS_D2_X17 379.581 6.66667
+CATS_D2_X18_Q 210.925 1.00194
+CATS_D2_X18 275.997 6.66667
+CATS_D2_X19_Q 197.395 1.0879
+CATS_D2_X19 242.286 6.66667
+CATS_D2_X20_Q 200.563 1.04395
+CATS_D2_X20 273.867 6.66667
+CATS_D2_X21_Q -63.6992 0.984043
+CATS_D2_X21 551.68 6.66667
+CATS_D2_X22_Q 289.819 1.06863
+CATS_D2_X22 208.376 6.66667
+CATS_D2_X23_Q 236.614 1.08491
+CATS_D2_X23 249.559 6.66667
+CATS_D2_X24_Q -99.3329 0.97496
+CATS_D2_X24 612.995 6.66667
+CATS_D2_X25_Q 81.6472 1.01254
+CATS_D2_X25 370.444 6.66667
+CATS_D2_X26_Q 179.739 1.01632
+CATS_D2_X26 313.988 6.66667
+CATS_D2_X27_Q 307.77 1.05167
+CATS_D2_X27 178.412 6.66667
+CATS_D2_X28_Q -438.044 0.893014
+CATS_D2_X28 297.785 6.66667
+CATS_D2_X29_Q -438.044 0.893014
+CATS_D2_X29 297.785 6.66667
diff --git a/NPAnalysis/e644pd/Calib/CATS2_Y.txt b/NPAnalysis/e644pd/Calib/CATS2_Y.txt
new file mode 100755
index 000000000..06ff8f925
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/CATS2_Y.txt
@@ -0,0 +1,58 @@
+CATS_D2_Y1_Q 0 0
+CATS_D2_Y1 0 6.66667
+CATS_D2_Y2_Q -149.777 0.95222
+CATS_D2_Y2 523.415 6.66667
+CATS_D2_Y3_Q -802.302 1.03279
+CATS_D2_Y3 1136.91 6.66667
+CATS_D2_Y4_Q -269.67 2.20921
+CATS_D2_Y4 417.543 6.66667
+CATS_D2_Y5_Q -26.8061 0.943487
+CATS_D2_Y5 228.863 6.66667
+CATS_D2_Y6_Q -15.8288 0.907456
+CATS_D2_Y6 284.051 6.66667
+CATS_D2_Y7_Q -5.34253 0.944179
+CATS_D2_Y7 357.005 6.66667
+CATS_D2_Y8_Q -49.7573 0.967038
+CATS_D2_Y8 238.669 6.66667
+CATS_D2_Y9_Q -62.7724 0.96825
+CATS_D2_Y9 234.125 6.66667
+CATS_D2_Y10_Q -78.1806 1.04285
+CATS_D2_Y10 248.126 6.66667
+CATS_D2_Y11_Q -122.135 1.10162
+CATS_D2_Y11 442.184 6.66667
+CATS_D2_Y12_Q -100.797 1.06511
+CATS_D2_Y12 255.357 6.66667
+CATS_D2_Y13_Q 17.9525 1.01693
+CATS_D2_Y13 169.08 6.66667
+CATS_D2_Y14_Q -10.911 1.00901
+CATS_D2_Y14 182.633 6.66667
+CATS_D2_Y15_Q -48.7773 1.02413
+CATS_D2_Y15 338.156 6.66667
+CATS_D2_Y16_Q 1.70928 0.999187
+CATS_D2_Y16 195.735 6.66667
+CATS_D2_Y17_Q -15.9886 0.925687
+CATS_D2_Y17 369.753 6.66667
+CATS_D2_Y18_Q 58.0163 0.985929
+CATS_D2_Y18 301.767 6.66667
+CATS_D2_Y19_Q 1.21055 0.961279
+CATS_D2_Y19 236.938 6.66667
+CATS_D2_Y20_Q 32.6956 0.944384
+CATS_D2_Y20 324.306 6.66667
+CATS_D2_Y21_Q -3.4457 0.931585
+CATS_D2_Y21 388.766 6.66667
+CATS_D2_Y22_Q 107.284 0.92604
+CATS_D2_Y22 96.7108 6.66667
+CATS_D2_Y23_Q -35.8513 0.928796
+CATS_D2_Y23 299.238 6.66667
+CATS_D2_Y24_Q 245.246 0.953409
+CATS_D2_Y24 0 6.66667
+CATS_D2_Y25_Q -22.7803 0.974057
+CATS_D2_Y25 245.642 6.66667
+CATS_D2_Y26_Q 12.6682 0.909567
+CATS_D2_Y26 206.412 6.66667
+CATS_D2_Y27_Q -76.6241 0.93262
+CATS_D2_Y27 334.839 6.66667
+CATS_D2_Y28_Q 1.36124 0.602108
+CATS_D2_Y28 271.22 6.66667
+CATS_D2_Y29_Q 1.36124 0.602108
+CATS_D2_Y29 271.22 6.66667
diff --git a/NPAnalysis/e644pd/Calib/CATS2_e644_1_X.txt b/NPAnalysis/e644pd/Calib/CATS2_e644_1_X.txt
new file mode 100755
index 000000000..6e3e1feeb
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/CATS2_e644_1_X.txt
@@ -0,0 +1,58 @@
+CATS_D2_X1_Q 0 0
+CATS_D2_X1 0 30
+CATS_D2_X2_Q 143.925 1.0461
+CATS_D2_X2 477.11 30
+CATS_D2_X3_Q 24.18 1.0779
+CATS_D2_X3 395.776 30
+CATS_D2_X4_Q 2.75523 1.04031
+CATS_D2_X4 420.405 30
+CATS_D2_X5_Q 14.8432 1.01916
+CATS_D2_X5 500.255 30
+CATS_D2_X6_Q 12.7034 0.969471
+CATS_D2_X6 398.011 30
+CATS_D2_X7_Q 145.511 0.951274
+CATS_D2_X7 349.189 30
+CATS_D2_X8_Q 10.2282 0.965792
+CATS_D2_X8 408.399 30
+CATS_D2_X9_Q -14.728 1.0124
+CATS_D2_X9 512.045 30
+CATS_D2_X10_Q -2.43497 1.00903
+CATS_D2_X10 448.163 30
+CATS_D2_X11_Q 6.68508 1.00868
+CATS_D2_X11 436.405 30
+CATS_D2_X12_Q -1.62469 1.00473
+CATS_D2_X12 516.892 30
+CATS_D2_X13_Q 10.7959 1.06379
+CATS_D2_X13 425.668 30
+CATS_D2_X14_Q 73.0344 1.01196
+CATS_D2_X14 340.025 30
+CATS_D2_X15_Q 29.0901 1.05732
+CATS_D2_X15 362.321 30
+CATS_D2_X16_Q 2.10486 1.00013
+CATS_D2_X16 507.075 30
+CATS_D2_X17_Q 201.996 1.0475
+CATS_D2_X17 400.653 30
+CATS_D2_X18_Q 196.946 1.0148
+CATS_D2_X18 399.687 30
+CATS_D2_X19_Q 206.539 1.09513
+CATS_D2_X19 292.079 30
+CATS_D2_X20_Q 218.317 1.05082
+CATS_D2_X20 365.183 30
+CATS_D2_X21_Q -55.4586 0.975697
+CATS_D2_X21 520.602 30
+CATS_D2_X22_Q 272.891 1.06029
+CATS_D2_X22 268.43 30
+CATS_D2_X23_Q 222.58 1.1002
+CATS_D2_X23 408.644 30
+CATS_D2_X24_Q -42.5161 1.02783
+CATS_D2_X24 596.642 30
+CATS_D2_X25_Q 159.199 1.03918
+CATS_D2_X25 415.518 30
+CATS_D2_X26_Q 307.055 1.07175
+CATS_D2_X26 373.646 30
+CATS_D2_X27_Q 345.567 1.1698
+CATS_D2_X27 189.724 30
+CATS_D2_X28_Q -85.1341 0.916449
+CATS_D2_X28 291.226 30
+CATS_D2_X29_Q 0 0
+CATS_D2_X29 0 30
diff --git a/NPAnalysis/e644pd/Calib/CATS2_e644_1_Y.txt b/NPAnalysis/e644pd/Calib/CATS2_e644_1_Y.txt
new file mode 100755
index 000000000..c3063fd74
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/CATS2_e644_1_Y.txt
@@ -0,0 +1,58 @@
+CATS_D2_Y1_Q 0 0
+CATS_D2_Y1 0 30
+CATS_D2_Y2_Q -162.41 0.953367
+CATS_D2_Y2 309.76 30
+CATS_D2_Y3_Q -806.525 1.01759
+CATS_D2_Y3 1092.59 30
+CATS_D2_Y4_Q -81.1712 1.04918
+CATS_D2_Y4 326.069 30
+CATS_D2_Y5_Q -51.0346 1.0002
+CATS_D2_Y5 224.045 30
+CATS_D2_Y6_Q -42.6938 1.02029
+CATS_D2_Y6 351.82 30
+CATS_D2_Y7_Q -38.5933 1.0515
+CATS_D2_Y7 241.536 30
+CATS_D2_Y8_Q -88.8955 1.11604
+CATS_D2_Y8 426.985 30
+CATS_D2_Y9_Q -61.3277 0.899078
+CATS_D2_Y9 225.073 30
+CATS_D2_Y10_Q -135.887 1.15042
+CATS_D2_Y10 256.783 30
+CATS_D2_Y11_Q -95.5116 0.971445
+CATS_D2_Y11 427.876 30
+CATS_D2_Y12_Q -83.0248 0.972254
+CATS_D2_Y12 402.264 30
+CATS_D2_Y13_Q 12.5352 1.03113
+CATS_D2_Y13 168.72 30
+CATS_D2_Y14_Q -13.2616 1.00987
+CATS_D2_Y14 364.871 30
+CATS_D2_Y15_Q -62.804 1.05286
+CATS_D2_Y15 439.354 30
+CATS_D2_Y16_Q 5.37267 0.999072
+CATS_D2_Y16 203.379 30
+CATS_D2_Y17_Q -21.6278 0.935375
+CATS_D2_Y17 311.796 30
+CATS_D2_Y18_Q 30.7288 0.992635
+CATS_D2_Y18 279.476 30
+CATS_D2_Y19_Q -7.389 0.964442
+CATS_D2_Y19 319.116 30
+CATS_D2_Y20_Q 24.1392 0.961418
+CATS_D2_Y20 178.14 30
+CATS_D2_Y21_Q -7.03405 0.933297
+CATS_D2_Y21 355.044 30
+CATS_D2_Y22_Q 124.436 0.929395
+CATS_D2_Y22 0 30
+CATS_D2_Y23_Q -38.5203 0.923783
+CATS_D2_Y23 297.139 30
+CATS_D2_Y24_Q 297.841 0.955538
+CATS_D2_Y24 0 30
+CATS_D2_Y25_Q 0 0
+CATS_D2_Y25 0 30
+CATS_D2_Y26_Q 19.3839 0.886428
+CATS_D2_Y26 316.367 30
+CATS_D2_Y27_Q -63.5243 0.883857
+CATS_D2_Y27 260.867 30
+CATS_D2_Y28_Q 2.16593 0.542711
+CATS_D2_Y28 275.469 30
+CATS_D2_Y29_Q 0 0
+CATS_D2_Y29 0 30
diff --git a/NPAnalysis/e644pd/Calib/MUST2_T1_X_Calib.txt b/NPAnalysis/e644pd/Calib/MUST2_T1_X_Calib.txt
new file mode 100755
index 000000000..0aeb6c27a
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/MUST2_T1_X_Calib.txt
@@ -0,0 +1,128 @@
+MUST2_T1_Si_X1_E 0 0.01
+MUST2_T1_Si_X2_E 0 0.01
+MUST2_T1_Si_X3_E 0 0.01
+MUST2_T1_Si_X4_E 0 0.01
+MUST2_T1_Si_X5_E 0 0.01
+MUST2_T1_Si_X6_E 0 0.01
+MUST2_T1_Si_X7_E 0 0.01
+MUST2_T1_Si_X8_E 0 0.01
+MUST2_T1_Si_X9_E 0 0.01
+MUST2_T1_Si_X10_E 0 0.01
+MUST2_T1_Si_X11_E 0 0.01
+MUST2_T1_Si_X12_E 0 0.01
+MUST2_T1_Si_X13_E 0 0.01
+MUST2_T1_Si_X14_E 0 0.01
+MUST2_T1_Si_X15_E 0 0.01
+MUST2_T1_Si_X16_E 0 0.01
+MUST2_T1_Si_X17_E 0 0.01
+MUST2_T1_Si_X18_E 0 0.01
+MUST2_T1_Si_X19_E 0 0.01
+MUST2_T1_Si_X20_E 0 0.01
+MUST2_T1_Si_X21_E 0 0.01
+MUST2_T1_Si_X22_E 0 0.01
+MUST2_T1_Si_X23_E 0 0.01
+MUST2_T1_Si_X24_E 0 0.01
+MUST2_T1_Si_X25_E 0 0.01
+MUST2_T1_Si_X26_E 0 0.01
+MUST2_T1_Si_X27_E 0 0.01
+MUST2_T1_Si_X28_E 0 0.01
+MUST2_T1_Si_X29_E 0 0.01
+MUST2_T1_Si_X30_E 0 0.01
+MUST2_T1_Si_X31_E 0 0.01
+MUST2_T1_Si_X32_E 0 0.01
+MUST2_T1_Si_X33_E 0 0.01
+MUST2_T1_Si_X34_E 0 0.01
+MUST2_T1_Si_X35_E 0 0.01
+MUST2_T1_Si_X36_E 0 0.01
+MUST2_T1_Si_X37_E 0 0.01
+MUST2_T1_Si_X38_E 0 0.01
+MUST2_T1_Si_X39_E 0 0.01
+MUST2_T1_Si_X40_E 0 0.01
+MUST2_T1_Si_X41_E 0 0.01
+MUST2_T1_Si_X42_E 0 0.01
+MUST2_T1_Si_X43_E 0 0.01
+MUST2_T1_Si_X44_E 0 0.01
+MUST2_T1_Si_X45_E 0 0.01
+MUST2_T1_Si_X46_E 0 0.01
+MUST2_T1_Si_X47_E 0 0.01
+MUST2_T1_Si_X48_E 0 0.01
+MUST2_T1_Si_X49_E 0 0.01
+MUST2_T1_Si_X50_E 0 0.01
+MUST2_T1_Si_X51_E 0 0.01
+MUST2_T1_Si_X52_E 0 0.01
+MUST2_T1_Si_X53_E 0 0.01
+MUST2_T1_Si_X54_E 0 0.01
+MUST2_T1_Si_X55_E 0 0.01
+MUST2_T1_Si_X56_E 0 0.01
+MUST2_T1_Si_X57_E 0 0.01
+MUST2_T1_Si_X58_E 0 0.01
+MUST2_T1_Si_X59_E 0 0.01
+MUST2_T1_Si_X60_E 0 0.01
+MUST2_T1_Si_X61_E 0 0.01
+MUST2_T1_Si_X62_E 0 0.01
+MUST2_T1_Si_X63_E 0 0.01
+MUST2_T1_Si_X64_E 0 0.01
+MUST2_T1_Si_X65_E 0 0.01
+MUST2_T1_Si_X66_E 0 0.01
+MUST2_T1_Si_X67_E 0 0.01
+MUST2_T1_Si_X68_E 0 0.01
+MUST2_T1_Si_X69_E 0 0.01
+MUST2_T1_Si_X70_E 0 0.01
+MUST2_T1_Si_X71_E 0 0.01
+MUST2_T1_Si_X72_E 0 0.01
+MUST2_T1_Si_X73_E 0 0.01
+MUST2_T1_Si_X74_E 0 0.01
+MUST2_T1_Si_X75_E 0 0.01
+MUST2_T1_Si_X76_E 0 0.01
+MUST2_T1_Si_X77_E 0 0.01
+MUST2_T1_Si_X78_E 0 0.01
+MUST2_T1_Si_X79_E 0 0.01
+MUST2_T1_Si_X80_E 0 0.01
+MUST2_T1_Si_X81_E 0 0.01
+MUST2_T1_Si_X82_E 0 0.01
+MUST2_T1_Si_X83_E 0 0.01
+MUST2_T1_Si_X84_E 0 0.01
+MUST2_T1_Si_X85_E 0 0.01
+MUST2_T1_Si_X86_E 0 0.01
+MUST2_T1_Si_X87_E 0 0.01
+MUST2_T1_Si_X88_E 0 0.01
+MUST2_T1_Si_X89_E 0 0.01
+MUST2_T1_Si_X90_E 0 0.01
+MUST2_T1_Si_X91_E 0 0.01
+MUST2_T1_Si_X92_E 0 0.01
+MUST2_T1_Si_X93_E 0 0.01
+MUST2_T1_Si_X94_E 0 0.01
+MUST2_T1_Si_X95_E 0 0.01
+MUST2_T1_Si_X96_E 0 0.01
+MUST2_T1_Si_X97_E 0 0.01
+MUST2_T1_Si_X98_E 0 0.01
+MUST2_T1_Si_X99_E 0 0.01
+MUST2_T1_Si_X100_E 0 0.01
+MUST2_T1_Si_X101_E 0 0.01
+MUST2_T1_Si_X102_E 0 0.01
+MUST2_T1_Si_X103_E 0 0.01
+MUST2_T1_Si_X104_E 0 0.01
+MUST2_T1_Si_X105_E 0 0.01
+MUST2_T1_Si_X106_E 0 0.01
+MUST2_T1_Si_X107_E 0 0.01
+MUST2_T1_Si_X108_E 0 0.01
+MUST2_T1_Si_X109_E 0 0.01
+MUST2_T1_Si_X110_E 0 0.01
+MUST2_T1_Si_X111_E 0 0.01
+MUST2_T1_Si_X112_E 0 0.01
+MUST2_T1_Si_X113_E 0 0.01
+MUST2_T1_Si_X114_E 0 0.01
+MUST2_T1_Si_X115_E 0 0.01
+MUST2_T1_Si_X116_E 0 0.01
+MUST2_T1_Si_X117_E 0 0.01
+MUST2_T1_Si_X118_E 0 0.01
+MUST2_T1_Si_X119_E 0 0.01
+MUST2_T1_Si_X120_E 0 0.01
+MUST2_T1_Si_X121_E 0 0.01
+MUST2_T1_Si_X122_E 0 0.01
+MUST2_T1_Si_X123_E 0 0.01
+MUST2_T1_Si_X124_E 0 0.01
+MUST2_T1_Si_X125_E 0 0.01
+MUST2_T1_Si_X126_E 0 0.01
+MUST2_T1_Si_X127_E 0 0.01
+MUST2_T1_Si_X128_E 0 0.01
diff --git a/NPAnalysis/e644pd/Calib/MUST2_T1_Y_Calib.txt b/NPAnalysis/e644pd/Calib/MUST2_T1_Y_Calib.txt
new file mode 100755
index 000000000..c32c000f0
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/MUST2_T1_Y_Calib.txt
@@ -0,0 +1,128 @@
+MUST2_T1_Si_Y1_E 0 0.01
+MUST2_T1_Si_Y2_E 0 0.01
+MUST2_T1_Si_Y3_E 0 0.01
+MUST2_T1_Si_Y4_E 0 0.01
+MUST2_T1_Si_Y5_E 0 0.01
+MUST2_T1_Si_Y6_E 0 0.01
+MUST2_T1_Si_Y7_E 0 0.01
+MUST2_T1_Si_Y8_E 0 0.01
+MUST2_T1_Si_Y9_E 0 0.01
+MUST2_T1_Si_Y10_E 0 0.01
+MUST2_T1_Si_Y11_E 0 0.01
+MUST2_T1_Si_Y12_E 0 0.01
+MUST2_T1_Si_Y13_E 0 0.01
+MUST2_T1_Si_Y14_E 0 0.01
+MUST2_T1_Si_Y15_E 0 0.01
+MUST2_T1_Si_Y16_E 0 0.01
+MUST2_T1_Si_Y17_E 0 0.01
+MUST2_T1_Si_Y18_E 0 0.01
+MUST2_T1_Si_Y19_E 0 0.01
+MUST2_T1_Si_Y20_E 0 0.01
+MUST2_T1_Si_Y21_E 0 0.01
+MUST2_T1_Si_Y22_E 0 0.01
+MUST2_T1_Si_Y23_E 0 0.01
+MUST2_T1_Si_Y24_E 0 0.01
+MUST2_T1_Si_Y25_E 0 0.01
+MUST2_T1_Si_Y26_E 0 0.01
+MUST2_T1_Si_Y27_E 0 0.01
+MUST2_T1_Si_Y28_E 0 0.01
+MUST2_T1_Si_Y29_E 0 0.01
+MUST2_T1_Si_Y30_E 0 0.01
+MUST2_T1_Si_Y31_E 0 0.01
+MUST2_T1_Si_Y32_E 0 0.01
+MUST2_T1_Si_Y33_E 0 0.01
+MUST2_T1_Si_Y34_E 0 0.01
+MUST2_T1_Si_Y35_E 0 0.01
+MUST2_T1_Si_Y36_E 0 0.01
+MUST2_T1_Si_Y37_E 0 0.01
+MUST2_T1_Si_Y38_E 0 0.01
+MUST2_T1_Si_Y39_E 0 0.01
+MUST2_T1_Si_Y40_E 0 0.01
+MUST2_T1_Si_Y41_E 0 0.01
+MUST2_T1_Si_Y42_E 0 0.01
+MUST2_T1_Si_Y43_E 0 0.01
+MUST2_T1_Si_Y44_E 0 0.01
+MUST2_T1_Si_Y45_E 0 0.01
+MUST2_T1_Si_Y46_E 0 0.01
+MUST2_T1_Si_Y47_E 0 0.01
+MUST2_T1_Si_Y48_E 0 0.01
+MUST2_T1_Si_Y49_E 0 0.01
+MUST2_T1_Si_Y50_E 0 0.01
+MUST2_T1_Si_Y51_E 0 0.01
+MUST2_T1_Si_Y52_E 0 0.01
+MUST2_T1_Si_Y53_E 0 0.01
+MUST2_T1_Si_Y54_E 0 0.01
+MUST2_T1_Si_Y55_E 0 0.01
+MUST2_T1_Si_Y56_E 0 0.01
+MUST2_T1_Si_Y57_E 0 0.01
+MUST2_T1_Si_Y58_E 0 0.01
+MUST2_T1_Si_Y59_E 0 0.01
+MUST2_T1_Si_Y60_E 0 0.01
+MUST2_T1_Si_Y61_E 0 0.01
+MUST2_T1_Si_Y62_E 0 0.01
+MUST2_T1_Si_Y63_E 0 0.01
+MUST2_T1_Si_Y64_E 0 0.01
+MUST2_T1_Si_Y65_E 0 0.01
+MUST2_T1_Si_Y66_E 0 0.01
+MUST2_T1_Si_Y67_E 0 0.01
+MUST2_T1_Si_Y68_E 0 0.01
+MUST2_T1_Si_Y69_E 0 0.01
+MUST2_T1_Si_Y70_E 0 0.01
+MUST2_T1_Si_Y71_E 0 0.01
+MUST2_T1_Si_Y72_E 0 0.01
+MUST2_T1_Si_Y73_E 0 0.01
+MUST2_T1_Si_Y74_E 0 0.01
+MUST2_T1_Si_Y75_E 0 0.01
+MUST2_T1_Si_Y76_E 0 0.01
+MUST2_T1_Si_Y77_E 0 0.01
+MUST2_T1_Si_Y78_E 0 0.01
+MUST2_T1_Si_Y79_E 0 0.01
+MUST2_T1_Si_Y80_E 0 0.01
+MUST2_T1_Si_Y81_E 0 0.01
+MUST2_T1_Si_Y82_E 0 0.01
+MUST2_T1_Si_Y83_E 0 0.01
+MUST2_T1_Si_Y84_E 0 0.01
+MUST2_T1_Si_Y85_E 0 0.01
+MUST2_T1_Si_Y86_E 0 0.01
+MUST2_T1_Si_Y87_E 0 0.01
+MUST2_T1_Si_Y88_E 0 0.01
+MUST2_T1_Si_Y89_E 0 0.01
+MUST2_T1_Si_Y90_E 0 0.01
+MUST2_T1_Si_Y91_E 0 0.01
+MUST2_T1_Si_Y92_E 0 0.01
+MUST2_T1_Si_Y93_E 0 0.01
+MUST2_T1_Si_Y94_E 0 0.01
+MUST2_T1_Si_Y95_E 0 0.01
+MUST2_T1_Si_Y96_E 0 0.01
+MUST2_T1_Si_Y97_E 0 0.01
+MUST2_T1_Si_Y98_E 0 0.01
+MUST2_T1_Si_Y99_E 0 0.01
+MUST2_T1_Si_Y100_E 0 0.01
+MUST2_T1_Si_Y101_E 0 0.01
+MUST2_T1_Si_Y102_E 0 0.01
+MUST2_T1_Si_Y103_E 0 0.01
+MUST2_T1_Si_Y104_E 0 0.01
+MUST2_T1_Si_Y105_E 0 0.01
+MUST2_T1_Si_Y106_E 0 0.01
+MUST2_T1_Si_Y107_E 0 0.01
+MUST2_T1_Si_Y108_E 0 0.01
+MUST2_T1_Si_Y109_E 0 0.01
+MUST2_T1_Si_Y110_E 0 0.01
+MUST2_T1_Si_Y111_E 0 0.01
+MUST2_T1_Si_Y112_E 0 0.01
+MUST2_T1_Si_Y113_E 0 0.01
+MUST2_T1_Si_Y114_E 0 0.01
+MUST2_T1_Si_Y115_E 0 0.01
+MUST2_T1_Si_Y116_E 0 0.01
+MUST2_T1_Si_Y117_E 0 0.01
+MUST2_T1_Si_Y118_E 0 0.01
+MUST2_T1_Si_Y119_E 0 0.01
+MUST2_T1_Si_Y120_E 0 0.01
+MUST2_T1_Si_Y121_E 0 0.01
+MUST2_T1_Si_Y122_E 0 0.01
+MUST2_T1_Si_Y123_E 0 0.01
+MUST2_T1_Si_Y124_E 0 0.01
+MUST2_T1_Si_Y125_E 0 0.01
+MUST2_T1_Si_Y126_E 0 0.01
+MUST2_T1_Si_Y127_E 0 0.01
+MUST2_T1_Si_Y128_E 0 0.01
diff --git a/NPAnalysis/e644pd/Calib/MUST2_T2_X_Calib.txt b/NPAnalysis/e644pd/Calib/MUST2_T2_X_Calib.txt
new file mode 100755
index 000000000..4282e8188
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/MUST2_T2_X_Calib.txt
@@ -0,0 +1,128 @@
+MUST2_T2_Si_X1_E 0 0.01
+MUST2_T2_Si_X2_E 0 0.01
+MUST2_T2_Si_X3_E 0 0.01
+MUST2_T2_Si_X4_E 0 0.01
+MUST2_T2_Si_X5_E 0 0.01
+MUST2_T2_Si_X6_E 0 0.01
+MUST2_T2_Si_X7_E 0 0.01
+MUST2_T2_Si_X8_E 0 0.01
+MUST2_T2_Si_X9_E 0 0.01
+MUST2_T2_Si_X10_E 0 0.01
+MUST2_T2_Si_X11_E 0 0.01
+MUST2_T2_Si_X12_E 0 0.01
+MUST2_T2_Si_X13_E 0 0.01
+MUST2_T2_Si_X14_E 0 0.01
+MUST2_T2_Si_X15_E 0 0.01
+MUST2_T2_Si_X16_E 0 0.01
+MUST2_T2_Si_X17_E 0 0.01
+MUST2_T2_Si_X18_E 0 0.01
+MUST2_T2_Si_X19_E 0 0.01
+MUST2_T2_Si_X20_E 0 0.01
+MUST2_T2_Si_X21_E 0 0.01
+MUST2_T2_Si_X22_E 0 0.01
+MUST2_T2_Si_X23_E 0 0.01
+MUST2_T2_Si_X24_E 0 0.01
+MUST2_T2_Si_X25_E 0 0.01
+MUST2_T2_Si_X26_E 0 0.01
+MUST2_T2_Si_X27_E 0 0.01
+MUST2_T2_Si_X28_E 0 0.01
+MUST2_T2_Si_X29_E 0 0.01
+MUST2_T2_Si_X30_E 0 0.01
+MUST2_T2_Si_X31_E 0 0.01
+MUST2_T2_Si_X32_E 0 0.01
+MUST2_T2_Si_X33_E 0 0.01
+MUST2_T2_Si_X34_E 0 0.01
+MUST2_T2_Si_X35_E 0 0.01
+MUST2_T2_Si_X36_E 0 0.01
+MUST2_T2_Si_X37_E 0 0.01
+MUST2_T2_Si_X38_E 0 0.01
+MUST2_T2_Si_X39_E 0 0.01
+MUST2_T2_Si_X40_E 0 0.01
+MUST2_T2_Si_X41_E 0 0.01
+MUST2_T2_Si_X42_E 0 0.01
+MUST2_T2_Si_X43_E 0 0.01
+MUST2_T2_Si_X44_E 0 0.01
+MUST2_T2_Si_X45_E 0 0.01
+MUST2_T2_Si_X46_E 0 0.01
+MUST2_T2_Si_X47_E 0 0.01
+MUST2_T2_Si_X48_E 0 0.01
+MUST2_T2_Si_X49_E 0 0.01
+MUST2_T2_Si_X50_E 0 0.01
+MUST2_T2_Si_X51_E 0 0.01
+MUST2_T2_Si_X52_E 0 0.01
+MUST2_T2_Si_X53_E 0 0.01
+MUST2_T2_Si_X54_E 0 0.01
+MUST2_T2_Si_X55_E 0 0.01
+MUST2_T2_Si_X56_E 0 0.01
+MUST2_T2_Si_X57_E 0 0.01
+MUST2_T2_Si_X58_E 0 0.01
+MUST2_T2_Si_X59_E 0 0.01
+MUST2_T2_Si_X60_E 0 0.01
+MUST2_T2_Si_X61_E 0 0.01
+MUST2_T2_Si_X62_E 0 0.01
+MUST2_T2_Si_X63_E 0 0.01
+MUST2_T2_Si_X64_E 0 0.01
+MUST2_T2_Si_X65_E 0 0.01
+MUST2_T2_Si_X66_E 0 0.01
+MUST2_T2_Si_X67_E 0 0.01
+MUST2_T2_Si_X68_E 0 0.01
+MUST2_T2_Si_X69_E 0 0.01
+MUST2_T2_Si_X70_E 0 0.01
+MUST2_T2_Si_X71_E 0 0.01
+MUST2_T2_Si_X72_E 0 0.01
+MUST2_T2_Si_X73_E 0 0.01
+MUST2_T2_Si_X74_E 0 0.01
+MUST2_T2_Si_X75_E 0 0.01
+MUST2_T2_Si_X76_E 0 0.01
+MUST2_T2_Si_X77_E 0 0.01
+MUST2_T2_Si_X78_E 0 0.01
+MUST2_T2_Si_X79_E 0 0.01
+MUST2_T2_Si_X80_E 0 0.01
+MUST2_T2_Si_X81_E 0 0.01
+MUST2_T2_Si_X82_E 0 0.01
+MUST2_T2_Si_X83_E 0 0.01
+MUST2_T2_Si_X84_E 0 0.01
+MUST2_T2_Si_X85_E 0 0.01
+MUST2_T2_Si_X86_E 0 0.01
+MUST2_T2_Si_X87_E 0 0.01
+MUST2_T2_Si_X88_E 0 0.01
+MUST2_T2_Si_X89_E 0 0.01
+MUST2_T2_Si_X90_E 0 0.01
+MUST2_T2_Si_X91_E 0 0.01
+MUST2_T2_Si_X92_E 0 0.01
+MUST2_T2_Si_X93_E 0 0.01
+MUST2_T2_Si_X94_E 0 0.01
+MUST2_T2_Si_X95_E 0 0.01
+MUST2_T2_Si_X96_E 0 0.01
+MUST2_T2_Si_X97_E 0 0.01
+MUST2_T2_Si_X98_E 0 0.01
+MUST2_T2_Si_X99_E 0 0.01
+MUST2_T2_Si_X100_E 0 0.01
+MUST2_T2_Si_X101_E 0 0.01
+MUST2_T2_Si_X102_E 0 0.01
+MUST2_T2_Si_X103_E 0 0.01
+MUST2_T2_Si_X104_E 0 0.01
+MUST2_T2_Si_X105_E 0 0.01
+MUST2_T2_Si_X106_E 0 0.01
+MUST2_T2_Si_X107_E 0 0.01
+MUST2_T2_Si_X108_E 0 0.01
+MUST2_T2_Si_X109_E 0 0.01
+MUST2_T2_Si_X110_E 0 0.01
+MUST2_T2_Si_X111_E 0 0.01
+MUST2_T2_Si_X112_E 0 0.01
+MUST2_T2_Si_X113_E 0 0.01
+MUST2_T2_Si_X114_E 0 0.01
+MUST2_T2_Si_X115_E 0 0.01
+MUST2_T2_Si_X116_E 0 0.01
+MUST2_T2_Si_X117_E 0 0.01
+MUST2_T2_Si_X118_E 0 0.01
+MUST2_T2_Si_X119_E 0 0.01
+MUST2_T2_Si_X120_E 0 0.01
+MUST2_T2_Si_X121_E 0 0.01
+MUST2_T2_Si_X122_E 0 0.01
+MUST2_T2_Si_X123_E 0 0.01
+MUST2_T2_Si_X124_E 0 0.01
+MUST2_T2_Si_X125_E 0 0.01
+MUST2_T2_Si_X126_E 0 0.01
+MUST2_T2_Si_X127_E 0 0.01
+MUST2_T2_Si_X128_E 0 0.01
diff --git a/NPAnalysis/e644pd/Calib/MUST2_T2_Y_Calib.txt b/NPAnalysis/e644pd/Calib/MUST2_T2_Y_Calib.txt
new file mode 100755
index 000000000..27eb42e72
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/MUST2_T2_Y_Calib.txt
@@ -0,0 +1,128 @@
+MUST2_T2_Si_Y1_E 0 0.01
+MUST2_T2_Si_Y2_E 0 0.01
+MUST2_T2_Si_Y3_E 0 0.01
+MUST2_T2_Si_Y4_E 0 0.01
+MUST2_T2_Si_Y5_E 0 0.01
+MUST2_T2_Si_Y6_E 0 0.01
+MUST2_T2_Si_Y7_E 0 0.01
+MUST2_T2_Si_Y8_E 0 0.01
+MUST2_T2_Si_Y9_E 0 0.01
+MUST2_T2_Si_Y10_E 0 0.01
+MUST2_T2_Si_Y11_E 0 0.01
+MUST2_T2_Si_Y12_E 0 0.01
+MUST2_T2_Si_Y13_E 0 0.01
+MUST2_T2_Si_Y14_E 0 0.01
+MUST2_T2_Si_Y15_E 0 0.01
+MUST2_T2_Si_Y16_E 0 0.01
+MUST2_T2_Si_Y17_E 0 0.01
+MUST2_T2_Si_Y18_E 0 0.01
+MUST2_T2_Si_Y19_E 0 0.01
+MUST2_T2_Si_Y20_E 0 0.01
+MUST2_T2_Si_Y21_E 0 0.01
+MUST2_T2_Si_Y22_E 0 0.01
+MUST2_T2_Si_Y23_E 0 0.01
+MUST2_T2_Si_Y24_E 0 0.01
+MUST2_T2_Si_Y25_E 0 0.01
+MUST2_T2_Si_Y26_E 0 0.01
+MUST2_T2_Si_Y27_E 0 0.01
+MUST2_T2_Si_Y28_E 0 0.01
+MUST2_T2_Si_Y29_E 0 0.01
+MUST2_T2_Si_Y30_E 0 0.01
+MUST2_T2_Si_Y31_E 0 0.01
+MUST2_T2_Si_Y32_E 0 0.01
+MUST2_T2_Si_Y33_E 0 0.01
+MUST2_T2_Si_Y34_E 0 0.01
+MUST2_T2_Si_Y35_E 0 0.01
+MUST2_T2_Si_Y36_E 0 0.01
+MUST2_T2_Si_Y37_E 0 0.01
+MUST2_T2_Si_Y38_E 0 0.01
+MUST2_T2_Si_Y39_E 0 0.01
+MUST2_T2_Si_Y40_E 0 0.01
+MUST2_T2_Si_Y41_E 0 0.01
+MUST2_T2_Si_Y42_E 0 0.01
+MUST2_T2_Si_Y43_E 0 0.01
+MUST2_T2_Si_Y44_E 0 0.01
+MUST2_T2_Si_Y45_E 0 0.01
+MUST2_T2_Si_Y46_E 0 0.01
+MUST2_T2_Si_Y47_E 0 0.01
+MUST2_T2_Si_Y48_E 0 0.01
+MUST2_T2_Si_Y49_E 0 0.01
+MUST2_T2_Si_Y50_E 0 0.01
+MUST2_T2_Si_Y51_E 0 0.01
+MUST2_T2_Si_Y52_E 0 0.01
+MUST2_T2_Si_Y53_E 0 0.01
+MUST2_T2_Si_Y54_E 0 0.01
+MUST2_T2_Si_Y55_E 0 0.01
+MUST2_T2_Si_Y56_E 0 0.01
+MUST2_T2_Si_Y57_E 0 0.01
+MUST2_T2_Si_Y58_E 0 0.01
+MUST2_T2_Si_Y59_E 0 0.01
+MUST2_T2_Si_Y60_E 0 0.01
+MUST2_T2_Si_Y61_E 0 0.01
+MUST2_T2_Si_Y62_E 0 0.01
+MUST2_T2_Si_Y63_E 0 0.01
+MUST2_T2_Si_Y64_E 0 0.01
+MUST2_T2_Si_Y65_E 0 0.01
+MUST2_T2_Si_Y66_E 0 0.01
+MUST2_T2_Si_Y67_E 0 0.01
+MUST2_T2_Si_Y68_E 0 0.01
+MUST2_T2_Si_Y69_E 0 0.01
+MUST2_T2_Si_Y70_E 0 0.01
+MUST2_T2_Si_Y71_E 0 0.01
+MUST2_T2_Si_Y72_E 0 0.01
+MUST2_T2_Si_Y73_E 0 0.01
+MUST2_T2_Si_Y74_E 0 0.01
+MUST2_T2_Si_Y75_E 0 0.01
+MUST2_T2_Si_Y76_E 0 0.01
+MUST2_T2_Si_Y77_E 0 0.01
+MUST2_T2_Si_Y78_E 0 0.01
+MUST2_T2_Si_Y79_E 0 0.01
+MUST2_T2_Si_Y80_E 0 0.01
+MUST2_T2_Si_Y81_E 0 0.01
+MUST2_T2_Si_Y82_E 0 0.01
+MUST2_T2_Si_Y83_E 0 0.01
+MUST2_T2_Si_Y84_E 0 0.01
+MUST2_T2_Si_Y85_E 0 0.01
+MUST2_T2_Si_Y86_E 0 0.01
+MUST2_T2_Si_Y87_E 0 0.01
+MUST2_T2_Si_Y88_E 0 0.01
+MUST2_T2_Si_Y89_E 0 0.01
+MUST2_T2_Si_Y90_E 0 0.01
+MUST2_T2_Si_Y91_E 0 0.01
+MUST2_T2_Si_Y92_E 0 0.01
+MUST2_T2_Si_Y93_E 0 0.01
+MUST2_T2_Si_Y94_E 0 0.01
+MUST2_T2_Si_Y95_E 0 0.01
+MUST2_T2_Si_Y96_E 0 0.01
+MUST2_T2_Si_Y97_E 0 0.01
+MUST2_T2_Si_Y98_E 0 0.01
+MUST2_T2_Si_Y99_E 0 0.01
+MUST2_T2_Si_Y100_E 0 0.01
+MUST2_T2_Si_Y101_E 0 0.01
+MUST2_T2_Si_Y102_E 0 0.01
+MUST2_T2_Si_Y103_E 0 0.01
+MUST2_T2_Si_Y104_E 0 0.01
+MUST2_T2_Si_Y105_E 0 0.01
+MUST2_T2_Si_Y106_E 0 0.01
+MUST2_T2_Si_Y107_E 0 0.01
+MUST2_T2_Si_Y108_E 0 0.01
+MUST2_T2_Si_Y109_E 0 0.01
+MUST2_T2_Si_Y110_E 0 0.01
+MUST2_T2_Si_Y111_E 0 0.01
+MUST2_T2_Si_Y112_E 0 0.01
+MUST2_T2_Si_Y113_E 0 0.01
+MUST2_T2_Si_Y114_E 0 0.01
+MUST2_T2_Si_Y115_E 0 0.01
+MUST2_T2_Si_Y116_E 0 0.01
+MUST2_T2_Si_Y117_E 0 0.01
+MUST2_T2_Si_Y118_E 0 0.01
+MUST2_T2_Si_Y119_E 0 0.01
+MUST2_T2_Si_Y120_E 0 0.01
+MUST2_T2_Si_Y121_E 0 0.01
+MUST2_T2_Si_Y122_E 0 0.01
+MUST2_T2_Si_Y123_E 0 0.01
+MUST2_T2_Si_Y124_E 0 0.01
+MUST2_T2_Si_Y125_E 0 0.01
+MUST2_T2_Si_Y126_E 0 0.01
+MUST2_T2_Si_Y127_E 0 0.01
+MUST2_T2_Si_Y128_E 0 0.01
diff --git a/NPAnalysis/e644pd/Calib/MUST2_T3_X_Calib.txt b/NPAnalysis/e644pd/Calib/MUST2_T3_X_Calib.txt
new file mode 100755
index 000000000..ff6cc415d
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/MUST2_T3_X_Calib.txt
@@ -0,0 +1,128 @@
+MUST2_T3_Si_X1_E 0 0.01
+MUST2_T3_Si_X2_E 0 0.01
+MUST2_T3_Si_X3_E 0 0.01
+MUST2_T3_Si_X4_E 0 0.01
+MUST2_T3_Si_X5_E 0 0.01
+MUST2_T3_Si_X6_E 0 0.01
+MUST2_T3_Si_X7_E 0 0.01
+MUST2_T3_Si_X8_E 0 0.01
+MUST2_T3_Si_X9_E 0 0.01
+MUST2_T3_Si_X10_E 0 0.01
+MUST2_T3_Si_X11_E 0 0.01
+MUST2_T3_Si_X12_E 0 0.01
+MUST2_T3_Si_X13_E 0 0.01
+MUST2_T3_Si_X14_E 0 0.01
+MUST2_T3_Si_X15_E 0 0.01
+MUST2_T3_Si_X16_E 0 0.01
+MUST2_T3_Si_X17_E 0 0.01
+MUST2_T3_Si_X18_E 0 0.01
+MUST2_T3_Si_X19_E 0 0.01
+MUST2_T3_Si_X20_E 0 0.01
+MUST2_T3_Si_X21_E 0 0.01
+MUST2_T3_Si_X22_E 0 0.01
+MUST2_T3_Si_X23_E 0 0.01
+MUST2_T3_Si_X24_E 0 0.01
+MUST2_T3_Si_X25_E 0 0.01
+MUST2_T3_Si_X26_E 0 0.01
+MUST2_T3_Si_X27_E 0 0.01
+MUST2_T3_Si_X28_E 0 0.01
+MUST2_T3_Si_X29_E 0 0.01
+MUST2_T3_Si_X30_E 0 0.01
+MUST2_T3_Si_X31_E 0 0.01
+MUST2_T3_Si_X32_E 0 0.01
+MUST2_T3_Si_X33_E 0 0.01
+MUST2_T3_Si_X34_E 0 0.01
+MUST2_T3_Si_X35_E 0 0.01
+MUST2_T3_Si_X36_E 0 0.01
+MUST2_T3_Si_X37_E 0 0.01
+MUST2_T3_Si_X38_E 0 0.01
+MUST2_T3_Si_X39_E 0 0.01
+MUST2_T3_Si_X40_E 0 0.01
+MUST2_T3_Si_X41_E 0 0.01
+MUST2_T3_Si_X42_E 0 0.01
+MUST2_T3_Si_X43_E 0 0.01
+MUST2_T3_Si_X44_E 0 0.01
+MUST2_T3_Si_X45_E 0 0.01
+MUST2_T3_Si_X46_E 0 0.01
+MUST2_T3_Si_X47_E 0 0.01
+MUST2_T3_Si_X48_E 0 0.01
+MUST2_T3_Si_X49_E 0 0.01
+MUST2_T3_Si_X50_E 0 0.01
+MUST2_T3_Si_X51_E 0 0.01
+MUST2_T3_Si_X52_E 0 0.01
+MUST2_T3_Si_X53_E 0 0.01
+MUST2_T3_Si_X54_E 0 0.01
+MUST2_T3_Si_X55_E 0 0.01
+MUST2_T3_Si_X56_E 0 0.01
+MUST2_T3_Si_X57_E 0 0.01
+MUST2_T3_Si_X58_E 0 0.01
+MUST2_T3_Si_X59_E 0 0.01
+MUST2_T3_Si_X60_E 0 0.01
+MUST2_T3_Si_X61_E 0 0.01
+MUST2_T3_Si_X62_E 0 0.01
+MUST2_T3_Si_X63_E 0 0.01
+MUST2_T3_Si_X64_E 0 0.01
+MUST2_T3_Si_X65_E 0 0.01
+MUST2_T3_Si_X66_E 0 0.01
+MUST2_T3_Si_X67_E 0 0.01
+MUST2_T3_Si_X68_E 0 0.01
+MUST2_T3_Si_X69_E 0 0.01
+MUST2_T3_Si_X70_E 0 0.01
+MUST2_T3_Si_X71_E 0 0.01
+MUST2_T3_Si_X72_E 0 0.01
+MUST2_T3_Si_X73_E 0 0.01
+MUST2_T3_Si_X74_E 0 0.01
+MUST2_T3_Si_X75_E 0 0.01
+MUST2_T3_Si_X76_E 0 0.01
+MUST2_T3_Si_X77_E 0 0.01
+MUST2_T3_Si_X78_E 0 0.01
+MUST2_T3_Si_X79_E 0 0.01
+MUST2_T3_Si_X80_E 0 0.01
+MUST2_T3_Si_X81_E 0 0.01
+MUST2_T3_Si_X82_E 0 0.01
+MUST2_T3_Si_X83_E 0 0.01
+MUST2_T3_Si_X84_E 0 0.01
+MUST2_T3_Si_X85_E 0 0.01
+MUST2_T3_Si_X86_E 0 0.01
+MUST2_T3_Si_X87_E 0 0.01
+MUST2_T3_Si_X88_E 0 0.01
+MUST2_T3_Si_X89_E 0 0.01
+MUST2_T3_Si_X90_E 0 0.01
+MUST2_T3_Si_X91_E 0 0.01
+MUST2_T3_Si_X92_E 0 0.01
+MUST2_T3_Si_X93_E 0 0.01
+MUST2_T3_Si_X94_E 0 0.01
+MUST2_T3_Si_X95_E 0 0.01
+MUST2_T3_Si_X96_E 0 0.01
+MUST2_T3_Si_X97_E 0 0.01
+MUST2_T3_Si_X98_E 0 0.01
+MUST2_T3_Si_X99_E 0 0.01
+MUST2_T3_Si_X100_E 0 0.01
+MUST2_T3_Si_X101_E 0 0.01
+MUST2_T3_Si_X102_E 0 0.01
+MUST2_T3_Si_X103_E 0 0.01
+MUST2_T3_Si_X104_E 0 0.01
+MUST2_T3_Si_X105_E 0 0.01
+MUST2_T3_Si_X106_E 0 0.01
+MUST2_T3_Si_X107_E 0 0.01
+MUST2_T3_Si_X108_E 0 0.01
+MUST2_T3_Si_X109_E 0 0.01
+MUST2_T3_Si_X110_E 0 0.01
+MUST2_T3_Si_X111_E 0 0.01
+MUST2_T3_Si_X112_E 0 0.01
+MUST2_T3_Si_X113_E 0 0.01
+MUST2_T3_Si_X114_E 0 0.01
+MUST2_T3_Si_X115_E 0 0.01
+MUST2_T3_Si_X116_E 0 0.01
+MUST2_T3_Si_X117_E 0 0.01
+MUST2_T3_Si_X118_E 0 0.01
+MUST2_T3_Si_X119_E 0 0.01
+MUST2_T3_Si_X120_E 0 0.01
+MUST2_T3_Si_X121_E 0 0.01
+MUST2_T3_Si_X122_E 0 0.01
+MUST2_T3_Si_X123_E 0 0.01
+MUST2_T3_Si_X124_E 0 0.01
+MUST2_T3_Si_X125_E 0 0.01
+MUST2_T3_Si_X126_E 0 0.01
+MUST2_T3_Si_X127_E 0 0.01
+MUST2_T3_Si_X128_E 0 0.01
diff --git a/NPAnalysis/e644pd/Calib/MUST2_T3_Y_Calib.txt b/NPAnalysis/e644pd/Calib/MUST2_T3_Y_Calib.txt
new file mode 100755
index 000000000..88258c821
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/MUST2_T3_Y_Calib.txt
@@ -0,0 +1,128 @@
+MUST2_T3_Si_Y1_E 0 0.01
+MUST2_T3_Si_Y2_E 0 0.01
+MUST2_T3_Si_Y3_E 0 0.01
+MUST2_T3_Si_Y4_E 0 0.01
+MUST2_T3_Si_Y5_E 0 0.01
+MUST2_T3_Si_Y6_E 0 0.01
+MUST2_T3_Si_Y7_E 0 0.01
+MUST2_T3_Si_Y8_E 0 0.01
+MUST2_T3_Si_Y9_E 0 0.01
+MUST2_T3_Si_Y10_E 0 0.01
+MUST2_T3_Si_Y11_E 0 0.01
+MUST2_T3_Si_Y12_E 0 0.01
+MUST2_T3_Si_Y13_E 0 0.01
+MUST2_T3_Si_Y14_E 0 0.01
+MUST2_T3_Si_Y15_E 0 0.01
+MUST2_T3_Si_Y16_E 0 0.01
+MUST2_T3_Si_Y17_E 0 0.01
+MUST2_T3_Si_Y18_E 0 0.01
+MUST2_T3_Si_Y19_E 0 0.01
+MUST2_T3_Si_Y20_E 0 0.01
+MUST2_T3_Si_Y21_E 0 0.01
+MUST2_T3_Si_Y22_E 0 0.01
+MUST2_T3_Si_Y23_E 0 0.01
+MUST2_T3_Si_Y24_E 0 0.01
+MUST2_T3_Si_Y25_E 0 0.01
+MUST2_T3_Si_Y26_E 0 0.01
+MUST2_T3_Si_Y27_E 0 0.01
+MUST2_T3_Si_Y28_E 0 0.01
+MUST2_T3_Si_Y29_E 0 0.01
+MUST2_T3_Si_Y30_E 0 0.01
+MUST2_T3_Si_Y31_E 0 0.01
+MUST2_T3_Si_Y32_E 0 0.01
+MUST2_T3_Si_Y33_E 0 0.01
+MUST2_T3_Si_Y34_E 0 0.01
+MUST2_T3_Si_Y35_E 0 0.01
+MUST2_T3_Si_Y36_E 0 0.01
+MUST2_T3_Si_Y37_E 0 0.01
+MUST2_T3_Si_Y38_E 0 0.01
+MUST2_T3_Si_Y39_E 0 0.01
+MUST2_T3_Si_Y40_E 0 0.01
+MUST2_T3_Si_Y41_E 0 0.01
+MUST2_T3_Si_Y42_E 0 0.01
+MUST2_T3_Si_Y43_E 0 0.01
+MUST2_T3_Si_Y44_E 0 0.01
+MUST2_T3_Si_Y45_E 0 0.01
+MUST2_T3_Si_Y46_E 0 0.01
+MUST2_T3_Si_Y47_E 0 0.01
+MUST2_T3_Si_Y48_E 0 0.01
+MUST2_T3_Si_Y49_E 0 0.01
+MUST2_T3_Si_Y50_E 0 0.01
+MUST2_T3_Si_Y51_E 0 0.01
+MUST2_T3_Si_Y52_E 0 0.01
+MUST2_T3_Si_Y53_E 0 0.01
+MUST2_T3_Si_Y54_E 0 0.01
+MUST2_T3_Si_Y55_E 0 0.01
+MUST2_T3_Si_Y56_E 0 0.01
+MUST2_T3_Si_Y57_E 0 0.01
+MUST2_T3_Si_Y58_E 0 0.01
+MUST2_T3_Si_Y59_E 0 0.01
+MUST2_T3_Si_Y60_E 0 0.01
+MUST2_T3_Si_Y61_E 0 0.01
+MUST2_T3_Si_Y62_E 0 0.01
+MUST2_T3_Si_Y63_E 0 0.01
+MUST2_T3_Si_Y64_E 0 0.01
+MUST2_T3_Si_Y65_E 0 0.01
+MUST2_T3_Si_Y66_E 0 0.01
+MUST2_T3_Si_Y67_E 0 0.01
+MUST2_T3_Si_Y68_E 0 0.01
+MUST2_T3_Si_Y69_E 0 0.01
+MUST2_T3_Si_Y70_E 0 0.01
+MUST2_T3_Si_Y71_E 0 0.01
+MUST2_T3_Si_Y72_E 0 0.01
+MUST2_T3_Si_Y73_E 0 0.01
+MUST2_T3_Si_Y74_E 0 0.01
+MUST2_T3_Si_Y75_E 0 0.01
+MUST2_T3_Si_Y76_E 0 0.01
+MUST2_T3_Si_Y77_E 0 0.01
+MUST2_T3_Si_Y78_E 0 0.01
+MUST2_T3_Si_Y79_E 0 0.01
+MUST2_T3_Si_Y80_E 0 0.01
+MUST2_T3_Si_Y81_E 0 0.01
+MUST2_T3_Si_Y82_E 0 0.01
+MUST2_T3_Si_Y83_E 0 0.01
+MUST2_T3_Si_Y84_E 0 0.01
+MUST2_T3_Si_Y85_E 0 0.01
+MUST2_T3_Si_Y86_E 0 0.01
+MUST2_T3_Si_Y87_E 0 0.01
+MUST2_T3_Si_Y88_E 0 0.01
+MUST2_T3_Si_Y89_E 0 0.01
+MUST2_T3_Si_Y90_E 0 0.01
+MUST2_T3_Si_Y91_E 0 0.01
+MUST2_T3_Si_Y92_E 0 0.01
+MUST2_T3_Si_Y93_E 0 0.01
+MUST2_T3_Si_Y94_E 0 0.01
+MUST2_T3_Si_Y95_E 0 0.01
+MUST2_T3_Si_Y96_E 0 0.01
+MUST2_T3_Si_Y97_E 0 0.01
+MUST2_T3_Si_Y98_E 0 0.01
+MUST2_T3_Si_Y99_E 0 0.01
+MUST2_T3_Si_Y100_E 0 0.01
+MUST2_T3_Si_Y101_E 0 0.01
+MUST2_T3_Si_Y102_E 0 0.01
+MUST2_T3_Si_Y103_E 0 0.01
+MUST2_T3_Si_Y104_E 0 0.01
+MUST2_T3_Si_Y105_E 0 0.01
+MUST2_T3_Si_Y106_E 0 0.01
+MUST2_T3_Si_Y107_E 0 0.01
+MUST2_T3_Si_Y108_E 0 0.01
+MUST2_T3_Si_Y109_E 0 0.01
+MUST2_T3_Si_Y110_E 0 0.01
+MUST2_T3_Si_Y111_E 0 0.01
+MUST2_T3_Si_Y112_E 0 0.01
+MUST2_T3_Si_Y113_E 0 0.01
+MUST2_T3_Si_Y114_E 0 0.01
+MUST2_T3_Si_Y115_E 0 0.01
+MUST2_T3_Si_Y116_E 0 0.01
+MUST2_T3_Si_Y117_E 0 0.01
+MUST2_T3_Si_Y118_E 0 0.01
+MUST2_T3_Si_Y119_E 0 0.01
+MUST2_T3_Si_Y120_E 0 0.01
+MUST2_T3_Si_Y121_E 0 0.01
+MUST2_T3_Si_Y122_E 0 0.01
+MUST2_T3_Si_Y123_E 0 0.01
+MUST2_T3_Si_Y124_E 0 0.01
+MUST2_T3_Si_Y125_E 0 0.01
+MUST2_T3_Si_Y126_E 0 0.01
+MUST2_T3_Si_Y127_E 0 0.01
+MUST2_T3_Si_Y128_E 0 0.01
diff --git a/NPAnalysis/e644pd/Calib/MUST2_T4_X_Calib.txt b/NPAnalysis/e644pd/Calib/MUST2_T4_X_Calib.txt
new file mode 100755
index 000000000..064c719e1
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/MUST2_T4_X_Calib.txt
@@ -0,0 +1,128 @@
+MUST2_T4_Si_X1_E 0 0.01
+MUST2_T4_Si_X2_E 0 0.01
+MUST2_T4_Si_X3_E 0 0.01
+MUST2_T4_Si_X4_E 0 0.01
+MUST2_T4_Si_X5_E 0 0.01
+MUST2_T4_Si_X6_E 0 0.01
+MUST2_T4_Si_X7_E 0 0.01
+MUST2_T4_Si_X8_E 0 0.01
+MUST2_T4_Si_X9_E 0 0.01
+MUST2_T4_Si_X10_E 0 0.01
+MUST2_T4_Si_X11_E 0 0.01
+MUST2_T4_Si_X12_E 0 0.01
+MUST2_T4_Si_X13_E 0 0.01
+MUST2_T4_Si_X14_E 0 0.01
+MUST2_T4_Si_X15_E 0 0.01
+MUST2_T4_Si_X16_E 0 0.01
+MUST2_T4_Si_X17_E 0 0.01
+MUST2_T4_Si_X18_E 0 0.01
+MUST2_T4_Si_X19_E 0 0.01
+MUST2_T4_Si_X20_E 0 0.01
+MUST2_T4_Si_X21_E 0 0.01
+MUST2_T4_Si_X22_E 0 0.01
+MUST2_T4_Si_X23_E 0 0.01
+MUST2_T4_Si_X24_E 0 0.01
+MUST2_T4_Si_X25_E 0 0.01
+MUST2_T4_Si_X26_E 0 0.01
+MUST2_T4_Si_X27_E 0 0.01
+MUST2_T4_Si_X28_E 0 0.01
+MUST2_T4_Si_X29_E 0 0.01
+MUST2_T4_Si_X30_E 0 0.01
+MUST2_T4_Si_X31_E 0 0.01
+MUST2_T4_Si_X32_E 0 0.01
+MUST2_T4_Si_X33_E 0 0.01
+MUST2_T4_Si_X34_E 0 0.01
+MUST2_T4_Si_X35_E 0 0.01
+MUST2_T4_Si_X36_E 0 0.01
+MUST2_T4_Si_X37_E 0 0.01
+MUST2_T4_Si_X38_E 0 0.01
+MUST2_T4_Si_X39_E 0 0.01
+MUST2_T4_Si_X40_E 0 0.01
+MUST2_T4_Si_X41_E 0 0.01
+MUST2_T4_Si_X42_E 0 0.01
+MUST2_T4_Si_X43_E 0 0.01
+MUST2_T4_Si_X44_E 0 0.01
+MUST2_T4_Si_X45_E 0 0.01
+MUST2_T4_Si_X46_E 0 0.01
+MUST2_T4_Si_X47_E 0 0.01
+MUST2_T4_Si_X48_E 0 0.01
+MUST2_T4_Si_X49_E 0 0.01
+MUST2_T4_Si_X50_E 0 0.01
+MUST2_T4_Si_X51_E 0 0.01
+MUST2_T4_Si_X52_E 0 0.01
+MUST2_T4_Si_X53_E 0 0.01
+MUST2_T4_Si_X54_E 0 0.01
+MUST2_T4_Si_X55_E 0 0.01
+MUST2_T4_Si_X56_E 0 0.01
+MUST2_T4_Si_X57_E 0 0.01
+MUST2_T4_Si_X58_E 0 0.01
+MUST2_T4_Si_X59_E 0 0.01
+MUST2_T4_Si_X60_E 0 0.01
+MUST2_T4_Si_X61_E 0 0.01
+MUST2_T4_Si_X62_E 0 0.01
+MUST2_T4_Si_X63_E 0 0.01
+MUST2_T4_Si_X64_E 0 0.01
+MUST2_T4_Si_X65_E 0 0.01
+MUST2_T4_Si_X66_E 0 0.01
+MUST2_T4_Si_X67_E 0 0.01
+MUST2_T4_Si_X68_E 0 0.01
+MUST2_T4_Si_X69_E 0 0.01
+MUST2_T4_Si_X70_E 0 0.01
+MUST2_T4_Si_X71_E 0 0.01
+MUST2_T4_Si_X72_E 0 0.01
+MUST2_T4_Si_X73_E 0 0.01
+MUST2_T4_Si_X74_E 0 0.01
+MUST2_T4_Si_X75_E 0 0.01
+MUST2_T4_Si_X76_E 0 0.01
+MUST2_T4_Si_X77_E 0 0.01
+MUST2_T4_Si_X78_E 0 0.01
+MUST2_T4_Si_X79_E 0 0.01
+MUST2_T4_Si_X80_E 0 0.01
+MUST2_T4_Si_X81_E 0 0.01
+MUST2_T4_Si_X82_E 0 0.01
+MUST2_T4_Si_X83_E 0 0.01
+MUST2_T4_Si_X84_E 0 0.01
+MUST2_T4_Si_X85_E 0 0.01
+MUST2_T4_Si_X86_E 0 0.01
+MUST2_T4_Si_X87_E 0 0.01
+MUST2_T4_Si_X88_E 0 0.01
+MUST2_T4_Si_X89_E 0 0.01
+MUST2_T4_Si_X90_E 0 0.01
+MUST2_T4_Si_X91_E 0 0.01
+MUST2_T4_Si_X92_E 0 0.01
+MUST2_T4_Si_X93_E 0 0.01
+MUST2_T4_Si_X94_E 0 0.01
+MUST2_T4_Si_X95_E 0 0.01
+MUST2_T4_Si_X96_E 0 0.01
+MUST2_T4_Si_X97_E 0 0.01
+MUST2_T4_Si_X98_E 0 0.01
+MUST2_T4_Si_X99_E 0 0.01
+MUST2_T4_Si_X100_E 0 0.01
+MUST2_T4_Si_X101_E 0 0.01
+MUST2_T4_Si_X102_E 0 0.01
+MUST2_T4_Si_X103_E 0 0.01
+MUST2_T4_Si_X104_E 0 0.01
+MUST2_T4_Si_X105_E 0 0.01
+MUST2_T4_Si_X106_E 0 0.01
+MUST2_T4_Si_X107_E 0 0.01
+MUST2_T4_Si_X108_E 0 0.01
+MUST2_T4_Si_X109_E 0 0.01
+MUST2_T4_Si_X110_E 0 0.01
+MUST2_T4_Si_X111_E 0 0.01
+MUST2_T4_Si_X112_E 0 0.01
+MUST2_T4_Si_X113_E 0 0.01
+MUST2_T4_Si_X114_E 0 0.01
+MUST2_T4_Si_X115_E 0 0.01
+MUST2_T4_Si_X116_E 0 0.01
+MUST2_T4_Si_X117_E 0 0.01
+MUST2_T4_Si_X118_E 0 0.01
+MUST2_T4_Si_X119_E 0 0.01
+MUST2_T4_Si_X120_E 0 0.01
+MUST2_T4_Si_X121_E 0 0.01
+MUST2_T4_Si_X122_E 0 0.01
+MUST2_T4_Si_X123_E 0 0.01
+MUST2_T4_Si_X124_E 0 0.01
+MUST2_T4_Si_X125_E 0 0.01
+MUST2_T4_Si_X126_E 0 0.01
+MUST2_T4_Si_X127_E 0 0.01
+MUST2_T4_Si_X128_E 0 0.01
diff --git a/NPAnalysis/e644pd/Calib/MUST2_T4_Y_Calib.txt b/NPAnalysis/e644pd/Calib/MUST2_T4_Y_Calib.txt
new file mode 100755
index 000000000..c7787e22e
--- /dev/null
+++ b/NPAnalysis/e644pd/Calib/MUST2_T4_Y_Calib.txt
@@ -0,0 +1,128 @@
+MUST2_T4_Si_Y1_E 0 0.01
+MUST2_T4_Si_Y2_E 0 0.01
+MUST2_T4_Si_Y3_E 0 0.01
+MUST2_T4_Si_Y4_E 0 0.01
+MUST2_T4_Si_Y5_E 0 0.01
+MUST2_T4_Si_Y6_E 0 0.01
+MUST2_T4_Si_Y7_E 0 0.01
+MUST2_T4_Si_Y8_E 0 0.01
+MUST2_T4_Si_Y9_E 0 0.01
+MUST2_T4_Si_Y10_E 0 0.01
+MUST2_T4_Si_Y11_E 0 0.01
+MUST2_T4_Si_Y12_E 0 0.01
+MUST2_T4_Si_Y13_E 0 0.01
+MUST2_T4_Si_Y14_E 0 0.01
+MUST2_T4_Si_Y15_E 0 0.01
+MUST2_T4_Si_Y16_E 0 0.01
+MUST2_T4_Si_Y17_E 0 0.01
+MUST2_T4_Si_Y18_E 0 0.01
+MUST2_T4_Si_Y19_E 0 0.01
+MUST2_T4_Si_Y20_E 0 0.01
+MUST2_T4_Si_Y21_E 0 0.01
+MUST2_T4_Si_Y22_E 0 0.01
+MUST2_T4_Si_Y23_E 0 0.01
+MUST2_T4_Si_Y24_E 0 0.01
+MUST2_T4_Si_Y25_E 0 0.01
+MUST2_T4_Si_Y26_E 0 0.01
+MUST2_T4_Si_Y27_E 0 0.01
+MUST2_T4_Si_Y28_E 0 0.01
+MUST2_T4_Si_Y29_E 0 0.01
+MUST2_T4_Si_Y30_E 0 0.01
+MUST2_T4_Si_Y31_E 0 0.01
+MUST2_T4_Si_Y32_E 0 0.01
+MUST2_T4_Si_Y33_E 0 0.01
+MUST2_T4_Si_Y34_E 0 0.01
+MUST2_T4_Si_Y35_E 0 0.01
+MUST2_T4_Si_Y36_E 0 0.01
+MUST2_T4_Si_Y37_E 0 0.01
+MUST2_T4_Si_Y38_E 0 0.01
+MUST2_T4_Si_Y39_E 0 0.01
+MUST2_T4_Si_Y40_E 0 0.01
+MUST2_T4_Si_Y41_E 0 0.01
+MUST2_T4_Si_Y42_E 0 0.01
+MUST2_T4_Si_Y43_E 0 0.01
+MUST2_T4_Si_Y44_E 0 0.01
+MUST2_T4_Si_Y45_E 0 0.01
+MUST2_T4_Si_Y46_E 0 0.01
+MUST2_T4_Si_Y47_E 0 0.01
+MUST2_T4_Si_Y48_E 0 0.01
+MUST2_T4_Si_Y49_E 0 0.01
+MUST2_T4_Si_Y50_E 0 0.01
+MUST2_T4_Si_Y51_E 0 0.01
+MUST2_T4_Si_Y52_E 0 0.01
+MUST2_T4_Si_Y53_E 0 0.01
+MUST2_T4_Si_Y54_E 0 0.01
+MUST2_T4_Si_Y55_E 0 0.01
+MUST2_T4_Si_Y56_E 0 0.01
+MUST2_T4_Si_Y57_E 0 0.01
+MUST2_T4_Si_Y58_E 0 0.01
+MUST2_T4_Si_Y59_E 0 0.01
+MUST2_T4_Si_Y60_E 0 0.01
+MUST2_T4_Si_Y61_E 0 0.01
+MUST2_T4_Si_Y62_E 0 0.01
+MUST2_T4_Si_Y63_E 0 0.01
+MUST2_T4_Si_Y64_E 0 0.01
+MUST2_T4_Si_Y65_E 0 0.01
+MUST2_T4_Si_Y66_E 0 0.01
+MUST2_T4_Si_Y67_E 0 0.01
+MUST2_T4_Si_Y68_E 0 0.01
+MUST2_T4_Si_Y69_E 0 0.01
+MUST2_T4_Si_Y70_E 0 0.01
+MUST2_T4_Si_Y71_E 0 0.01
+MUST2_T4_Si_Y72_E 0 0.01
+MUST2_T4_Si_Y73_E 0 0.01
+MUST2_T4_Si_Y74_E 0 0.01
+MUST2_T4_Si_Y75_E 0 0.01
+MUST2_T4_Si_Y76_E 0 0.01
+MUST2_T4_Si_Y77_E 0 0.01
+MUST2_T4_Si_Y78_E 0 0.01
+MUST2_T4_Si_Y79_E 0 0.01
+MUST2_T4_Si_Y80_E 0 0.01
+MUST2_T4_Si_Y81_E 0 0.01
+MUST2_T4_Si_Y82_E 0 0.01
+MUST2_T4_Si_Y83_E 0 0.01
+MUST2_T4_Si_Y84_E 0 0.01
+MUST2_T4_Si_Y85_E 0 0.01
+MUST2_T4_Si_Y86_E 0 0.01
+MUST2_T4_Si_Y87_E 0 0.01
+MUST2_T4_Si_Y88_E 0 0.01
+MUST2_T4_Si_Y89_E 0 0.01
+MUST2_T4_Si_Y90_E 0 0.01
+MUST2_T4_Si_Y91_E 0 0.01
+MUST2_T4_Si_Y92_E 0 0.01
+MUST2_T4_Si_Y93_E 0 0.01
+MUST2_T4_Si_Y94_E 0 0.01
+MUST2_T4_Si_Y95_E 0 0.01
+MUST2_T4_Si_Y96_E 0 0.01
+MUST2_T4_Si_Y97_E 0 0.01
+MUST2_T4_Si_Y98_E 0 0.01
+MUST2_T4_Si_Y99_E 0 0.01
+MUST2_T4_Si_Y100_E 0 0.01
+MUST2_T4_Si_Y101_E 0 0.01
+MUST2_T4_Si_Y102_E 0 0.01
+MUST2_T4_Si_Y103_E 0 0.01
+MUST2_T4_Si_Y104_E 0 0.01
+MUST2_T4_Si_Y105_E 0 0.01
+MUST2_T4_Si_Y106_E 0 0.01
+MUST2_T4_Si_Y107_E 0 0.01
+MUST2_T4_Si_Y108_E 0 0.01
+MUST2_T4_Si_Y109_E 0 0.01
+MUST2_T4_Si_Y110_E 0 0.01
+MUST2_T4_Si_Y111_E 0 0.01
+MUST2_T4_Si_Y112_E 0 0.01
+MUST2_T4_Si_Y113_E 0 0.01
+MUST2_T4_Si_Y114_E 0 0.01
+MUST2_T4_Si_Y115_E 0 0.01
+MUST2_T4_Si_Y116_E 0 0.01
+MUST2_T4_Si_Y117_E 0 0.01
+MUST2_T4_Si_Y118_E 0 0.01
+MUST2_T4_Si_Y119_E 0 0.01
+MUST2_T4_Si_Y120_E 0 0.01
+MUST2_T4_Si_Y121_E 0 0.01
+MUST2_T4_Si_Y122_E 0 0.01
+MUST2_T4_Si_Y123_E 0 0.01
+MUST2_T4_Si_Y124_E 0 0.01
+MUST2_T4_Si_Y125_E 0 0.01
+MUST2_T4_Si_Y126_E 0 0.01
+MUST2_T4_Si_Y127_E 0 0.01
+MUST2_T4_Si_Y128_E 0 0.01
diff --git a/NPAnalysis/e644pd/RunToTreat.txt b/NPAnalysis/e644pd/RunToTreat.txt
new file mode 100755
index 000000000..b065d8b09
--- /dev/null
+++ b/NPAnalysis/e644pd/RunToTreat.txt
@@ -0,0 +1,5 @@
+TTreeName
+ AutoTree
+RootFileName
+ run_0075.root
+
diff --git a/NPAnalysis/e644pd/detector.txt b/NPAnalysis/e644pd/detector.txt
new file mode 100755
index 000000000..ee157f752
--- /dev/null
+++ b/NPAnalysis/e644pd/detector.txt
@@ -0,0 +1,60 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CATSArray
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+CATSDetector
+ X1_Y1= 38.86 -34.36 -1193
+ X28_Y1= -32.26 -34.36 -1193
+ X1_Y28= 38.86 37.36 -1193
+ X28_Y28= -32.26 37.36 -1193
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
+CATSDetector
+ X1_Y1= -35.56 -35.36 -684
+ X28_Y1= 35.56 -35.36 -684
+ X1_Y28= -35.56 35.76 -684
+ X28_Y28= 35.56 35.76 -684
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+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
+X1_Y1= -116.04 9.84 138.55
+X1_Y128= -22.8 9.84 175.95
+X128_Y1= -104.09 105.03 108.76
+X128_Y128= -10.85 105.03 146.16
+SI= 1
+SILI= 0
+CSI= 1
+VIS= all
+
+%%%%%%% Telescope 3 %%%%%%%
+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 4 %%%%%%%
+M2Telescope
+X1_Y1= 116.04 -9.84 138.55
+X1_Y128= 22.8 -9.84 175.95
+X128_Y1= 104.09 -105.03 108.76
+X128_Y128= 10.85 -105.03 146.16
+SI= 1
+SILI= 0
+CSI= 1
+VIS= all
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/NPLib/Core/NPOptionManager.cxx b/NPLib/Core/NPOptionManager.cxx
index b060adce3..1ab20e1e6 100644
--- a/NPLib/Core/NPOptionManager.cxx
+++ b/NPLib/Core/NPOptionManager.cxx
@@ -248,6 +248,7 @@ void NPOptionManager::CheckDetectorConfiguration(){
// close ConfigFile
ConfigFile.close();
+
}
diff --git a/NPLib/Misc/TTacData.h b/NPLib/Misc/TTacData.h
index 71ce98a58..d557fab0b 100644
--- a/NPLib/Misc/TTacData.h
+++ b/NPLib/Misc/TTacData.h
@@ -103,7 +103,7 @@ class TTacData : public TObject {
void SetTAC_FAG_CATS2(UShort_t T) {fTAC_FAG_CATS2 = T;}
- ClassDef(TTacData,2) // TacData structure
+ ClassDef(TTacData,3) // TacData structure
};
#endif
diff --git a/NPLib/Misc/TTacPhysics.cxx b/NPLib/Misc/TTacPhysics.cxx
index 1784f6fae..91533e62c 100644
--- a/NPLib/Misc/TTacPhysics.cxx
+++ b/NPLib/Misc/TTacPhysics.cxx
@@ -144,14 +144,14 @@ NPL::VDetector* TTacPhysics::Construct(){
// Registering the construct method to the factory //
////////////////////////////////////////////////////////////////////////////////
extern "C"{
-class proxy{
+class proxy_tac{
public:
- proxy(){
+ proxy_tac(){
NPL::DetectorFactory::getInstance()->AddToken("Tac","Tac");
NPL::DetectorFactory::getInstance()->AddDetector("Tac",TTacPhysics::Construct);
}
};
-proxy p;
+proxy_tac p_tac;
}
diff --git a/NPLib/Sharc/TSharcPhysics.cxx b/NPLib/Sharc/TSharcPhysics.cxx
index 03679bb3d..a253fb633 100644
--- a/NPLib/Sharc/TSharcPhysics.cxx
+++ b/NPLib/Sharc/TSharcPhysics.cxx
@@ -719,7 +719,7 @@ void TSharcPhysics::InitializeRootOutput(){
///// Specific to SharcArray ////
void TSharcPhysics::AddBoxDetector(double Z){
double BOX_Wafer_Width = 52.20;
- // double BOX_Wafer_Length = 76.20;
+ double BOX_Wafer_Length = 76.20;
double BOX_ActiveArea_Length = 76.2;
double BOX_ActiveArea_Width = 52.2;
@@ -734,10 +734,10 @@ void TSharcPhysics::AddBoxDetector(double Z){
for(int i = 0 ; i < 4 ; i++){
m_NumberOfDetector++;
if(Z<0){// Up Stream
- if(i==0) {U=TVector3(1,0,0);V=TVector3(0,0,1); Strip_1_1=TVector3(-36,40.5,Z-BOX_Wafer_Width/2.) ;}
- else if(i==1) {U=TVector3(0,1,0);V=TVector3(0,0,1); Strip_1_1=TVector3(-40.5,-36,Z-BOX_Wafer_Width/2.) ;}
- else if(i==2) {U=TVector3(-1,0,0);V=TVector3(0,0,1); Strip_1_1=TVector3(36,-40.5,Z-BOX_Wafer_Width/2.) ;}
- else if(i==3) {U=TVector3(0,-1,0);V=TVector3(0,0,1); Strip_1_1=TVector3(40.5,36,Z-BOX_Wafer_Width/2.) ;}
+ if(i==0) {U=TVector3(1,0,0);V=TVector3(0,0,1); Strip_1_1=TVector3(-36,42.5,Z-BOX_Wafer_Width/2.) ;}
+ else if(i==1) {U=TVector3(0,1,0);V=TVector3(0,0,1); Strip_1_1=TVector3(-42.5,-36,Z-BOX_Wafer_Width/2.) ;}
+ else if(i==2) {U=TVector3(-1,0,0);V=TVector3(0,0,1); Strip_1_1=TVector3(36,-42.5,Z-BOX_Wafer_Width/2.) ;}
+ else if(i==3) {U=TVector3(0,-1,0);V=TVector3(0,0,1); Strip_1_1=TVector3(42.5,36,Z-BOX_Wafer_Width/2.) ;}
}
if(Z>0){//Down Stream
diff --git a/NPLib/Tiara/TTiaraHyballPhysics.cxx b/NPLib/Tiara/TTiaraHyballPhysics.cxx
index 11a4196b0..9cbe25908 100644
--- a/NPLib/Tiara/TTiaraHyballPhysics.cxx
+++ b/NPLib/Tiara/TTiaraHyballPhysics.cxx
@@ -713,7 +713,6 @@ void TTiaraHyballPhysics::InitializeStandardParameter(){
///////////////////////////////////////////////////////////////////////////
namespace TiaraHyball_LOCAL{
- CalibrationManager* Cal = CalibrationManager::getInstance();
// DSSD
// Ring
double fStrip_Ring_E(const TTiaraHyballData* m_EventData , const int i){
@@ -722,7 +721,7 @@ name+= NPL::itoa( m_EventData->GetRingEDetectorNbr(i) ) ;
name+= "_STRIP_RING" ;
name+= NPL::itoa( m_EventData->GetRingEStripNbr(i) ) ;
name+= "_E";
- return Cal->ApplyCalibration(name ,
+ return CalibrationManager::getInstance()->ApplyCalibration(name ,
fStrip_Ring_Matchstick(m_EventData,i) );
}
double fStrip_Ring_Matchstick(const TTiaraHyballData* m_EventData , const int i){
@@ -731,7 +730,7 @@ name+= NPL::itoa( m_EventData->GetRingEDetectorNbr(i) ) ;
name+= "_STRIP_RING" ;
name+= NPL::itoa( m_EventData->GetRingEStripNbr(i) ) ;
name+= "_MATCHSTICK";
- return Cal->ApplyCalibration(name ,
+ return CalibrationManager::getInstance()->ApplyCalibration(name ,
m_EventData->GetRingEEnergy(i) );
}
@@ -741,7 +740,7 @@ name+= NPL::itoa( m_EventData->GetRingTDetectorNbr(i) ) ;
name+= "_STRIP_RING" ;
name+= NPL::itoa( m_EventData->GetRingTStripNbr(i) ) ;
name+="_T";
- return Cal->ApplyCalibration(name ,
+ return CalibrationManager::getInstance()->ApplyCalibration(name ,
m_EventData->GetRingTTime(i) );
}
@@ -752,7 +751,7 @@ name+= NPL::itoa( m_EventData->GetSectorEDetectorNbr(i) ) ;
name+= "_STRIP_SECTOR" ;
name+= NPL::itoa( m_EventData->GetSectorEStripNbr(i) ) ;
name+="_E";
- return Cal->ApplyCalibration(name,
+ return CalibrationManager::getInstance()->ApplyCalibration(name,
fStrip_Sector_Matchstick(m_EventData,i) );
}
@@ -762,7 +761,7 @@ name+= NPL::itoa( m_EventData->GetSectorEDetectorNbr(i) ) ;
name+= "_STRIP_SECTOR" ;
name+= NPL::itoa( m_EventData->GetSectorEStripNbr(i) ) ;
name+="_MATCHSTICK";
- return Cal->ApplyCalibration(name,
+ return CalibrationManager::getInstance()->ApplyCalibration(name,
m_EventData->GetSectorEEnergy(i) );
}
@@ -772,7 +771,7 @@ name+= NPL::itoa( m_EventData->GetSectorTDetectorNbr(i) );
name+= "_STRIP_SECTOR" ;
name+= NPL::itoa( m_EventData->GetSectorTStripNbr(i) );
name+="_T";
- return Cal->ApplyCalibration(name,
+ return CalibrationManager::getInstance()->ApplyCalibration(name,
m_EventData->GetRingTTime(i) );
}
--
GitLab