diff --git a/NPLib/Detectors/FPDTamu/TFPDTamuPhysics.cxx b/NPLib/Detectors/FPDTamu/TFPDTamuPhysics.cxx
index 0db22dbd503965ff129f47aa2962b80f0a20e2db..737fba89d2557a8d7c4a0912f6cc987cf1ba3a7d 100644
--- a/NPLib/Detectors/FPDTamu/TFPDTamuPhysics.cxx
+++ b/NPLib/Detectors/FPDTamu/TFPDTamuPhysics.cxx
@@ -816,7 +816,7 @@ void TFPDTamuPhysics::AddParameterToCalibrationManager() {
         "Delta_R"+ NPL::itoa(i+1)+"_C1_T");
   }
 
-<<<<<<< HEAD
+//<<<<<<< HEAD
   for (int iDet = 0; iDet < m_NumberOfMicro; ++iDet) { // in case there's 2 micromega add up the rows
     for (int iRow = 0; iRow < 4; ++iRow) { // 4 rows
       for (int iCol = 0; iCol < 7; ++iCol) { // 7 columns
@@ -829,7 +829,8 @@ void TFPDTamuPhysics::AddParameterToCalibrationManager() {
         Cal->AddParameter("FPDTamu", 
             "Micro"+NPL::itoa(det)+"_R"+ NPL::itoa(row)+"_C"+ NPL::itoa(col)+"_T",
             "Micro"+NPL::itoa(det)+"_R"+ NPL::itoa(row)+"_C"+ NPL::itoa(col)+"_T");      
-=======
+//=======
+/*
   for (int i = 0; i < m_NumberOfMicro; ++i) { // in case there's 2 micromega add up the rows
 	//by Shuya 170414.
     //for (int iRow = 0; iRow < 4; ++iRow) {
@@ -840,6 +841,7 @@ void TFPDTamuPhysics::AddParameterToCalibrationManager() {
         Cal->AddParameter("FPDTamu", "Micro_R"+ NPL::itoa((4*i)+iRow+1)+"_C"+ NPL::itoa(iCol+1)+"_T",
             "Micro_R"+ NPL::itoa((4*i)+iRow+1)+"_C"+ NPL::itoa(iCol+1)+"_T");      
 >>>>>>> ab259f332a96dc9a1007ef922f6a311d79bf6d2f
+*/
       }
     }
   }
diff --git a/NPLib/Detectors/GeTAMU/TGeTAMUPhysics.cxx b/NPLib/Detectors/GeTAMU/TGeTAMUPhysics.cxx
index b4b2c5e7591b7249bfab76e94dc3e1b2eddddfae..de03a18e878bcec122f5d4c19567285cacf1b124 100644
--- a/NPLib/Detectors/GeTAMU/TGeTAMUPhysics.cxx
+++ b/NPLib/Detectors/GeTAMU/TGeTAMUPhysics.cxx
@@ -362,13 +362,7 @@ void TGeTAMUPhysics::PreTreat(){
     else{
       clover = m_EventData->GetCoreCloverNbrE(i);
       crystal = m_EventData->GetCoreCrystalNbrE(i);
-<<<<<<< HEAD
-      name = "GETAMU/D"+ NPL::itoa(clover)+"_CRY"+ NPL::itoa(crystal);
-//by Shuya and Momo 170228.
-      //Energy =  cal->ApplyCalibration(name+"_E", Eraw);
-      Energy =  cal->ApplyCalibration(name+"_E", Eraw+gRandom->Rndm());
-=======
-*/
+      Eraw = m_EventData->GetCoreEnergy(i);
   }
 
   if(Eraw>=m_Cry_E_Raw_Threshold && IsValidChannel(0, clover, crystal)){
@@ -382,19 +376,7 @@ void TGeTAMUPhysics::PreTreat(){
     }
   }
 }
-=======
-      Eraw = m_EventData->GetCoreEnergy(i);
 
-      if(Eraw>=m_Cry_E_Raw_Threshold && IsValidChannel(0, clover, crystal)){
-        name = "GETAMU/D"+ NPL::itoa(clover)+"_CRY"+ NPL::itoa(crystal);
-        Energy =  cal->ApplyCalibration(name+"_E", Eraw+Random->Rndm());
-        if(Energy>=m_Cry_E_Threshold){
-          Singles_CloverMap_CryEN[clover].push_back(crystal);
-          Singles_CloverMap_CryE[clover].push_back(Energy);
-          m_PreTreatedData->SetCoreE(clover,crystal,Energy);
-        }
-      }
->>>>>>> ab259f332a96dc9a1007ef922f6a311d79bf6d2f
 
       mysizeT = m_EventData->GetMultiplicityCoreT();
       for(unsigned int i = 0 ; i < mysizeT ; i++){
@@ -452,8 +434,8 @@ void TGeTAMUPhysics::PreTreat(){
         }
       }
 
-    }
-  }
+//    }
+//  }
 }
 
 /////////////////////////////////////////////////
diff --git a/NPLib/Utility/npanalysis.cxx b/NPLib/Utility/npanalysis.cxx
index 14f65d58127573a4bb23cb426ed6ffdefd9383b2..bef123f36c22282fea36edd654251c1458f973f1 100644
--- a/NPLib/Utility/npanalysis.cxx
+++ b/NPLib/Utility/npanalysis.cxx
@@ -166,7 +166,10 @@ int main(int argc , char** argv){
     if(!IsPhysics){ 
       for (unsigned int i = 0 ; i < nentries; i++) { 
         // Get the raw Data
+cout << "!" << endl;
+cout << nentries << endl;
         Chain -> GetEntry(i);
+cout << "!!" << endl;
         // Build the current event
         myDetector->BuildPhysicalEvent();
         // User Analysis
diff --git a/Projects/T40/Analysis.cxx b/Projects/T40/Analysis.cxx
index 2f3d8f7148b10487dc46a4daf41edcdd2ec4996f..fdfad708b70958d8fe28458103e69655ce1d82af 100644
--- a/Projects/T40/Analysis.cxx
+++ b/Projects/T40/Analysis.cxx
@@ -113,10 +113,11 @@ void Analysis::Init(){
   string beam=NPL::ChangeNameToG4Standard(myReaction->GetNucleus1().GetName());
   LightTarget = NPL::EnergyLoss(light+"_"+TargetMaterial+".SRIM","SRIM",10 );
 //by Shuya 170505
-  //LightAl = NPL::EnergyLoss(light+"_Al.SRIM","SRIM",10);
-  LightAl = NPL::EnergyLoss("He4_Al.SRIM","SRIM",10);
-  //LightSi = NPL::EnergyLoss(light+"_Si.SRIM","SRIM",10);
-  LightSi = NPL::EnergyLoss("He4_Si.SRIM","SRIM",10);
+//Note when you analyze the triple alpha calibration run, use He4_Al and He4_Si
+  LightAl = NPL::EnergyLoss(light+"_Al.SRIM","SRIM",10);
+  //LightAl = NPL::EnergyLoss("He4_Al.SRIM","SRIM",10);
+  LightSi = NPL::EnergyLoss(light+"_Si.SRIM","SRIM",10);
+  //LightSi = NPL::EnergyLoss("He4_Si.SRIM","SRIM",10);
   BeamTarget = NPL::EnergyLoss(beam+"_"+TargetMaterial+".SRIM","SRIM",10);
   FinalBeamEnergy = BeamTarget.Slow(OriginalBeamEnergy, TargetThickness*0.5, 0);
   myReaction->SetBeamEnergy(FinalBeamEnergy);
@@ -133,6 +134,7 @@ void Analysis::Init(){
   Si_E_TB = 0 ;
   Energy = 0;
 
+
   //Original_ELab=0;
   //Original_ThetaLab=0;
   XTarget =0;