diff --git a/Inputs/DetectorConfiguration/Riken_65mm.detector b/Inputs/DetectorConfiguration/Riken_65mm.detector
index 0f907750e29737e00527cac73470a356f1ec34b3..b9cb10e37b93666dc589fa0891edb6d25c6bf812 100644
--- a/Inputs/DetectorConfiguration/Riken_65mm.detector
+++ b/Inputs/DetectorConfiguration/Riken_65mm.detector
@@ -86,15 +86,15 @@ CSI= 1
VIS= all
%%%%%%% Telescope 6 %%%%%%%
%M2Telescope
-%X1_Y1= 155.77 50.23 8.18
-%X1_Y128= 155.77 -50.23 8.18
-%X128_Y1= 133.17 50.23 -89.7
-%X128_Y128= 133.17 -50.23 -89.7
-%SI= 1
-%SILI= 1
-%CSI= 0
-%VIS= all
-%% Alternate Telescope 6 %%
+X1_Y1= 155.77 50.23 8.18
+X1_Y128= 155.77 -50.23 8.18
+X128_Y1= 133.17 50.23 -89.7
+X128_Y128= 133.17 -50.23 -89.7
+SI= 1
+SILI= 1
+CSI= 0
+VIS= all
+% Alternate Telescope 6 %%
M2Telescope
THETA= -130
PHI= 0
@@ -115,35 +115,47 @@ SILI= 1
CSI= 0
VIS= all
+%%%%%%% Telescope 8 %%%%%%%
+M2Telescope
+X1_Y1= 27.07 50.23 -154.49
+X1_Y128= 116.58 50.23 -108.88
+X128_Y1= 27.07 -50.23 -154.49
+X128_Y128= 116.58 -50.23 -108.88
+SI= 1
+SILI= 1
+CSI= 0
+VIS= all
+
+
%%%%%%%%%%%%%%%%%%%%%
-%%AddThinSi
+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
+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
-%A= -11.79 56.29 89.59
-%B= -58.66 56.29 70.79
-%C= -64.48 9.85 85.31
-%D= -17.61 9.85 104.11
+ThinSi
+A= -11.79 56.29 89.59
+B= -58.66 56.29 70.79
+C= -64.48 9.85 85.31
+D= -17.61 9.85 104.11
%
%%%%%%%%%% Det 3 %%%%%%%%
-%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.59
+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.59
%
%%%%%%%%%% Det 4 %%%%%%%%
-%ThinSi
-%A= 11.79 -56.29 89.59
-%B= 58.66 -56.29 70.79
-%C= 64.48 -9.85 85.31
-%D= 17.61 -9.85 104.11
+ThinSi
+A= 11.79 -56.29 89.59
+B= 58.66 -56.29 70.79
+C= 64.48 -9.85 85.31
+D= 17.61 -9.85 104.11
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%ScintillatorPlastic
diff --git a/NPAnalysis/10He_Riken/include/ObjectManager.hh b/NPAnalysis/10He_Riken/include/ObjectManager.hh
index 47e09a3cb2df16b98579a2ef3f7a8f651ef9c268..b161bf02f99c8fba7cedea66dccd00b446e70ebb 100644
--- a/NPAnalysis/10He_Riken/include/ObjectManager.hh
+++ b/NPAnalysis/10He_Riken/include/ObjectManager.hh
@@ -35,6 +35,7 @@
#include "TMust2Physics.h"
#include "TSSSDPhysics.h"
#include "TPlasticPhysics.h"
+#include "NPOptionManager.h"
// Use CLHEP System of unit and Physical Constant
#include "CLHEP/Units/GlobalSystemOfUnits.h"
diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx
index 8d92e2228cf8cb0c4d0ab6e28ba355a77fdc4850..5ec91c1eca92f4e1b01748b0786265bf1af74a94 100644
--- a/NPLib/MUST2/TMust2Physics.cxx
+++ b/NPLib/MUST2/TMust2Physics.cxx
@@ -493,20 +493,20 @@ void TMust2Physics::ReadAnalysisConfig()
cout << whatToDo << " " << DataBuffer << endl;
int telescope = atoi(DataBuffer.substr(2,1).c_str());
int channel = -1;
- if (DataBuffer.compare(4,4,"STRX") == 0) {
- channel = atoi(DataBuffer.substr(9).c_str());
+ if (DataBuffer.compare(3,4,"STRX") == 0) {
+ channel = atoi(DataBuffer.substr(7).c_str());
*(XChannelStatus[telescope].begin()+channel) = false;
}
- else if (DataBuffer.compare(4,4,"STRY") == 0) {
- channel = atoi(DataBuffer.substr(9).c_str());
+ else if (DataBuffer.compare(3,4,"STRY") == 0) {
+ channel = atoi(DataBuffer.substr(7).c_str());
*(YChannelStatus[telescope].begin()+channel) = false;
}
- else if (DataBuffer.compare(4,4,"SILI") == 0) {
- channel = atoi(DataBuffer.substr(9).c_str());
+ else if (DataBuffer.compare(3,4,"SILI") == 0) {
+ channel = atoi(DataBuffer.substr(7).c_str());
*(SiLiChannelStatus[telescope].begin()+channel) = false;
}
- else if (DataBuffer.compare(4,3,"CSI") == 0) {
- channel = atoi(DataBuffer.substr(8).c_str());
+ else if (DataBuffer.compare(3,3,"CSI") == 0) {
+ channel = atoi(DataBuffer.substr(6).c_str());
*(CsIChannelStatus[telescope].begin()+channel) = false;
}
else {
@@ -1191,7 +1191,11 @@ void TMust2Physics::InitializeStandardParameter()
{
// Enable all channel
vector< bool > ChannelStatus;
-
+ XChannelStatus.clear() ;
+ YChannelStatus.clear() ;
+ SiLiChannelStatus.clear() ;
+ CsIChannelStatus.clear() ;
+
ChannelStatus.resize(128,true);
for(int i = 0 ; i < NumberOfTelescope ; i ++)
{
diff --git a/NPLib/SSSD/TSSSDPhysics.cxx b/NPLib/SSSD/TSSSDPhysics.cxx
index 0acd6498c7c100573c20f7ceee743fc34145ed9d..9e9c57402d95c4cf0d049f90ef2f1e2e66ffeafa 100644
--- a/NPLib/SSSD/TSSSDPhysics.cxx
+++ b/NPLib/SSSD/TSSSDPhysics.cxx
@@ -55,7 +55,7 @@ TSSSDPhysics::TSSSDPhysics()
PreTreatedData = new TSSSDData ;
EventPhysics = this ;
E_Threshold = 0 ;
- Pedestal_Threshold = 000;
+ Pedestal_Threshold = 0 ;
}
///////////////////////////////////////////////////////////////////////////
TSSSDPhysics::~TSSSDPhysics()
@@ -225,10 +225,10 @@ void TSSSDPhysics::ReadConfiguration(string Path)
check_C = false ;
check_D = false ;
- check_Theta = false ;
- check_Phi = false ;
- check_R = false ;
- check_beta = false ;
+ check_Theta = false ;
+ check_Phi = false ;
+ check_R = false ;
+ check_beta = false ;
ReadingStatus = false ;
}
@@ -337,11 +337,11 @@ void TSSSDPhysics::PreTreat()
void TSSSDPhysics::InitializeStandardParameter()
{
// Enable all channel
- vector< bool > TempChannelStatus;
-
+ vector<bool> TempChannelStatus;
+ ChannelStatus.clear();
TempChannelStatus.resize(16,true);
- for(int i = 0 ; i < NumberOfDetector ; i ++)
- ChannelStatus[i+1] = TempChannelStatus;
+ for(int i = 0 ; i < NumberOfDetector ; i ++)
+ ChannelStatus[i+1] = TempChannelStatus;
}
///////////////////////////////////////////////////////////////////////////
void TSSSDPhysics::ReadAnalysisConfig()
@@ -397,7 +397,7 @@ void TSSSDPhysics::ReadAnalysisConfig()
int telescope = atoi(DataBuffer.substr(2,1).c_str());
int channel = -1;
if (DataBuffer.compare(3,3,"STR") == 0) {
- channel = atoi(DataBuffer.substr(8).c_str());
+ channel = atoi(DataBuffer.substr(6).c_str());
*(ChannelStatus[telescope].begin()+channel) = false;
}