diff --git a/Reconstruction/RecPFACyber/src/Algorithm/PFOReclusteringAlg.cpp b/Reconstruction/RecPFACyber/src/Algorithm/PFOReclusteringAlg.cpp
index 996c56e3d4ffda6fbfbcd6bafe2da4bbd5f1aae0..73e77e32dbe5ddc4a24a5d950d100cd32aa64a93 100644
--- a/Reconstruction/RecPFACyber/src/Algorithm/PFOReclusteringAlg.cpp
+++ b/Reconstruction/RecPFACyber/src/Algorithm/PFOReclusteringAlg.cpp
@@ -17,8 +17,8 @@ StatusCode PFOReclusteringAlg::ReadSettings(Settings& m_settings){
   if(settings.map_floatPars.find("SplitSigma")==settings.map_floatPars.end()) settings.map_floatPars["SplitSigma"] = 0.2;
   if(settings.map_floatPars.find("NeutralMergeSigma")==settings.map_floatPars.end()) settings.map_floatPars["NeutralMergeSigma"] = 0.;
   if(settings.map_floatPars.find("VirtualMergeSigma")==settings.map_floatPars.end()) settings.map_floatPars["VirtualMergeSigma"] = 0.4;
-  if(settings.map_floatPars.find("MinAngleForNeuMerge")==settings.map_floatPars.end()) settings.map_floatPars["MinAngleForNeuMerge"] = 0.20;
-  if(settings.map_floatPars.find("MinAngleForVirMerge")==settings.map_floatPars.end()) settings.map_floatPars["MinAngleForVirMerge"] = 0.24;
+  if(settings.map_floatPars.find("MinAngleForNeuMerge")==settings.map_floatPars.end()) settings.map_floatPars["MinAngleForNeuMerge"] = 0.18;
+  if(settings.map_floatPars.find("MinAngleForVirMerge")==settings.map_floatPars.end()) settings.map_floatPars["MinAngleForVirMerge"] = 0.20;
 
 
   return StatusCode::SUCCESS;
diff --git a/Reconstruction/RecPFACyber/src/Tools/OutputCreator.cpp b/Reconstruction/RecPFACyber/src/Tools/OutputCreator.cpp
index 43ed4967d6a6ee5c9f31e6ad909ed7ba58e49fa8..3016a26265784f8820417a334fc67eef73a1720a 100644
--- a/Reconstruction/RecPFACyber/src/Tools/OutputCreator.cpp
+++ b/Reconstruction/RecPFACyber/src/Tools/OutputCreator.cpp
@@ -160,8 +160,8 @@ namespace Cyber{
           TVector3 p3vec = vec_trks[trkIndex]->getP3();
           edm4hep::Vector3f p3(p3vec.x(), p3vec.y(), p3vec.z());
           m_pfo.setMomentum(p3);
-          m_pfo.setEnergy( vec_trks[trkIndex]->getMomentum() );
-          m_pfo.setMass(139.57039); //TODO: all charged particles are set to pion mass. 
+          m_pfo.setMass(0.139570); //TODO: all charged particles are set to pion mass. 
+          m_pfo.setEnergy( sqrt(vec_trks[trkIndex]->getMomentum()*vec_trks[trkIndex]->getMomentum() + 0.139570*0.139570) );
         }
         else{
           TVector3 p3vec = vec_Pos*(  (EcalClusE+HcalClusE)/vec_Pos.Mag() );