Debug in CyberPFA: neighbor clustering and electron energy scale

• Fix a bug in neighbor clustering, which will cause >2 neighbor hits in endcap.
• Fix a bug in ECAL cluster energy scale, sensitive to electron E/p
• Fix a bug in ParticleID. Neutral particle momentum should be tuned with energy and mass.

Reconstruction/RecPFACyber/src/Tools/OutputCreator.cpp

@@ -46,9 +46,8 @@ namespace Cyber{
       //TODO: this is a calibration based on PID. May need to move this step into the algorithms. 
       if(vec_trks.size()==0) ecalcalib = settings.map_floatPars.at("ECALNeutralCalib");
       else{
-        //if( p_pfos[ip]->getTrackMomentum() < 15. || p_pfos[ip]->getECALClusterEnergy()*ecalcalib/p_pfos[ip]->getTrackMomentum() < 0.8 ) ecalcalib = settings.map_floatPars.at("ECALChargedCalib");
-        //else ecalcalib = settings.map_floatPars.at("ECALNeutralCalib");
-        ecalcalib = settings.map_floatPars.at("ECALChargedCalib");
+        if( p_pfos[ip]->getTrackMomentum() < 15. || p_pfos[ip]->getECALClusterEnergy()*ecalcalib/p_pfos[ip]->getTrackMomentum() < 0.8 ) ecalcalib = settings.map_floatPars.at("ECALChargedCalib");
+        else ecalcalib = settings.map_floatPars.at("ECALNeutralCalib");
       }
 
       TVector3 vec_Pos(0.,0.,0.);