Merge branch 'master' of https://github.com/teuben/nemo

teuben · Dec 15, 2024 · e760f60 · e760f60
2 parents c89b098 + 40cabca
commit e760f60
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -2,3 +2,6 @@ numpydoc>=0.9.1
 sphinx>=4.1.1
 sphinx-rtd-theme
 sphinx_inline_tabs
+# dysh
+sphinx-rtd-theme
+sphinxcontrib-mermaid
diff --git a/docs/whatsnew.html b/docs/whatsnew.html
@@ -24,7 +24,7 @@ <H1> What's New in NEMO </H1>
 <A NAME=4_4_3>
   <H2> 4.4.3/4.4.4:  in git </H2>
   <UL>
-    <LI> (Dec 7, 2024) added falcon2 docs
+    <LI> (Dec 7, 2024) added falcon2 docs.
     <LI> (Oct 20, 2024) more code-rot fixed for gcc-14
     <LI> (Jun 21, 2024) enhanced <A HREF=man_html/tabsmooth.1.html>tabsmooth</A> with more filters
     <LI> (Apr 20, 2024) experimental <A HREF=man_html/falcon.1.html>falcon</A> program

diff --git a/man/man1/diskspectrum.1 b/man/man1/diskspectrum.1
@@ -14,6 +14,10 @@ a given inclination and a global spectral profile is computed.
 .PP
 This program was cloned from \fImkdisk(1NEMO)\fP, with which it shares
 a number of keywords. Instead of producing a \fIsnapshot(5NEMO)\fP, it
+produces a table, containing the global spectrum.
+.PP
+Warning: this program is under development, for example, currently it
+produces the unsmoothed half spectrum shifted to 0.
 
 .SH "PARAMETERS"
 The following parameters are recognized in any order if the keyword is also

diff --git a/man/man1/lineid.1 b/man/man1/lineid.1
@@ -1,4 +1,4 @@
-.TH LINEID 1NEMO "14 December 2024"
+.TH LINEID 1NEMO "15 December 2024"
 
 .SH "NAME"
 lineid \- Identify peaks in a spectrum and optionally find lines

diff --git a/man/man1/nemoinp.1 b/man/man1/nemoinp.1
@@ -25,7 +25,7 @@ nemoinp		1:10:2
 matlab		1:2:10
 seq		1 2 10
 numpy.arange	1,10,2	last element (10) is never used
-IDL		findgen(5)*2+1
+IDL		findgen(5)*2+1  -or-  indgen(5)*2+1
 
 .fi
 
@@ -99,7 +99,7 @@ seq(1), tabgen(1NEMO), tabmath(1NEMO), nemoinp(3NEMO), getrange(3NEMO), function
    nemoinp 'iflt(1,2,3,4)'   print 3, not 4, because 1 is less than 2
    nemoinp 30:30:15 dms=t    convert hexasegimal 30:30:15 into decimal 30.5043
    nemoinp c,G,h,p,m         a few good constants
-   nemoinp 'p*pi/(3600*180)' 1 AU in km
+   nemoinp 'p*pi/(3600*180)' 1 AU in m
 .fi
 
 .SH "AUTHOR"

diff --git a/man/man8/programs.8 b/man/man8/programs.8
@@ -1,4 +1,3 @@
-.\" pjt 
 .TH "PROGRAMS" 8NEMO "8 December 2024"
 
 .SH "NAME"

diff --git a/src/kernel/tab/lineid.c b/src/kernel/tab/lineid.c
@@ -1,7 +1,7 @@
 /*
  *  LINEID:   draft
  *
- *    13-dec-2024 0.2 simple brightest peak finder
+ *    13-dec-2024 0.2 simple brightest peak finder.
  */
 
 /**************** INCLUDE FILES ********************************/ 

diff --git a/src/scripts/mknemo.d/falcON2 b/src/scripts/mknemo.d/falcON2
@@ -21,4 +21,4 @@ else
 endif
 git checkout $branch
 
-echo "Installation is still manual. See INSTALL.md"
+echo "Installation is still manual. See $NEMO/local/$dir/INSTALL.md"