From ec0235fa83d792c7b69ca26c69540c6b06407fba Mon Sep 17 00:00:00 2001 From: Yana Savchenko Date: Sat, 30 Nov 2024 18:48:26 +0300 Subject: [PATCH 1/2] Fix surface density, add cumulative surface density --- usr/dehnen/falcON/src/public/lib/profile.cc | 4 ++-- usr/dehnen/falcON/src/public/manip/projprof.cc | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/usr/dehnen/falcON/src/public/lib/profile.cc b/usr/dehnen/falcON/src/public/lib/profile.cc index 46f29ad13..4f616c5f3 100644 --- a/usr/dehnen/falcON/src/public/lib/profile.cc +++ b/usr/dehnen/falcON/src/public/lib/profile.cc @@ -335,7 +335,7 @@ mr(0), rr(0), sd(0), vl(0), vr(0), sl(0), ba(0), ph(0), al(0) Mvr += xi * (mi*vp); add_outer_product2(Mxx,xi,mi); } - sd[i] = M / (Pi * i? square(R[ir[i+1]]) - square(R[ir[i-1]]) + sd[i] = M / Pi / (i? square(R[ir[i+1]]) - square(R[ir[i-1]]) : square(R[ir[i+1]]) ); vl[i] = Mvl/M; vr[i] = abs(Mvr)/M; @@ -361,7 +361,7 @@ mr(0), rr(0), sd(0), vl(0), vr(0), sl(0), ba(0), ph(0), al(0) M += mi; add_outer_product2(Mxx,xi,mi); } - sd[i] = M / (Pi * i? square(R[ir[i+1]]) - square(R[ir[i-1]]) + sd[i] = M / Pi / (i? square(R[ir[i+1]]) - square(R[ir[i-1]]) : square(R[ir[i+1]]) ); symmetrize2(Mxx); double ab = Mxx[0][0]-Mxx[1][1]; diff --git a/usr/dehnen/falcON/src/public/manip/projprof.cc b/usr/dehnen/falcON/src/public/manip/projprof.cc index f65eb0cd8..9cb60217c 100644 --- a/usr/dehnen/falcON/src/public/manip/projprof.cc +++ b/usr/dehnen/falcON/src/public/manip/projprof.cc @@ -127,7 +127,7 @@ namespace falcON { namespace Manipulate { }; ////////////////////////////////////////////////////////////////////////////// inline void projprof::print_line(bool V) const { - OUT <<"#--------------------------------------------------"; + OUT <<"#-----------------------------------------------------------------"; if(V) OUT<<"----------------------------------------------------"; OUT <<'\n'; @@ -171,8 +171,12 @@ namespace falcON { namespace Manipulate { else OUT<<'\n'; if(X0) OUT<<"# xcen = "<<(*X0)<<'\n'; if(V0) OUT<<"# vcen = "<<(*V0)<<'\n'; + OUT << "# Nb = " << PP.Nb() << '\n'; + OUT << "# N = " << PP.N() << '\n'; + OUT << "# Mtot = " << PP.Mtot() << '\n'; OUT <<"#\n" <<"# radius Sigma"; + OUT<<" Sigma_cum"; if(PP.has_vels()) OUT<<" sigma_l"; OUT <<" b/a PA"; @@ -182,7 +186,8 @@ namespace falcON { namespace Manipulate { print_line(PP.has_vels()); for(int i=0; i!=PP.N(); ++i) { OUT << std::setw(12) << PP.rad(i) <<' ' - << std::setw(12) << PP.Sig(i) <<' '; + << std::setw(12) << PP.Sig(i) <<' ' + << std::setw(12) << PP.Mr(i) / (Pi * square(PP.rad(i))) <<' '; if(PP.has_vels()) OUT<< std::setw(12) << PP.vlos(i)<<' ' << std::setw(12) << PP.vrot(i)<<' ' From b28302323ed04fd0589b5009477589faf0c771f3 Mon Sep 17 00:00:00 2001 From: Yana Savchenko Date: Wed, 16 Apr 2025 17:53:49 +0300 Subject: [PATCH 2/2] remove unused code --- usr/dehnen/falcON/src/public/manip/projprof.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usr/dehnen/falcON/src/public/manip/projprof.cc b/usr/dehnen/falcON/src/public/manip/projprof.cc index 9cb60217c..92878d196 100644 --- a/usr/dehnen/falcON/src/public/manip/projprof.cc +++ b/usr/dehnen/falcON/src/public/manip/projprof.cc @@ -176,7 +176,6 @@ namespace falcON { namespace Manipulate { OUT << "# Mtot = " << PP.Mtot() << '\n'; OUT <<"#\n" <<"# radius Sigma"; - OUT<<" Sigma_cum"; if(PP.has_vels()) OUT<<" sigma_l"; OUT <<" b/a PA"; @@ -186,8 +185,7 @@ namespace falcON { namespace Manipulate { print_line(PP.has_vels()); for(int i=0; i!=PP.N(); ++i) { OUT << std::setw(12) << PP.rad(i) <<' ' - << std::setw(12) << PP.Sig(i) <<' ' - << std::setw(12) << PP.Mr(i) / (Pi * square(PP.rad(i))) <<' '; + << std::setw(12) << PP.Sig(i) <<' '; if(PP.has_vels()) OUT<< std::setw(12) << PP.vlos(i)<<' ' << std::setw(12) << PP.vrot(i)<<' '