Updates to distribution_manifest.py

perwin · Jul 2, 2024 · 9dfd4a0 · 9dfd4a0
1 parent 5d12896
commit 9dfd4a0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/distribution_manifest.py b/distribution_manifest.py
@@ -131,26 +131,24 @@
 func_core-sersic 
 func_broken-exp 
 func_broken-exp2d
-func_king
-func_king2
 func_moffat 
 func_flatsky 
 func_tilted-sky-plane
+func_flatbar
 func_gaussian-ring 
 func_gaussian-ring2side
 func_gaussian-ring-az 
-func_edge-on-disk_n4762 
-func_edge-on-disk_n4762v2 
-func_n4608disk 
 func_edge-on-ring 
 func_edge-on-ring2side
 func_edge-on-disk
+func_king
+func_king2
 func_brokenexpdisk3d 
 func_expdisk3d 
 func_gaussianring3d 
 func_ferrersbar2d
 func_ferrersbar3d
-func_flatbar
+func_peanut_dattathri
 func_pointsource
 func_pointsource-rot
 helper_funcs
@@ -159,6 +157,24 @@
 psf_interpolators
 """
 
+functionobject_obj_string = """function_object func_gaussian func_exp func_gen-exp  
+        func_sersic func_gen-sersic func_core-sersic func_broken-exp
+        func_broken-exp2d func_moffat func_flatsky func_tilted-sky-plane 
+        func_flatbar func_gaussian-ring func_gaussian-ring2side func_gaussian-ring-az  
+        func_edge-on-ring func_edge-on-ring2side 
+        func_king func_king2 func_ferrersbar2d  func_peanut_dattathri
+        helper_funcs helper_funcs_3d psf_interpolators"""
+#if useGSL:
+# NOTE: the following modules require GSL be present
+functionobject_obj_string += " func_edge-on-disk"
+functionobject_obj_string += " integrator"
+functionobject_obj_string += " func_expdisk3d"  # requires integrator
+functionobject_obj_string += " func_brokenexpdisk3d"  # requires integrator
+functionobject_obj_string += " func_gaussianring3d"  # requires integrator
+functionobject_obj_string += " func_ferrersbar3d"  # requires integrator
+functionobject_obj_string += " func_pointsource"
+functionobject_obj_string += " func_pointsource-rot"
+
 
 example_files = """
 config_exponential_ic3478_256.dat

diff --git a/make_distributions.py b/make_distributions.py
@@ -2,7 +2,7 @@
 
 # script for generating distribution tarballs
 
-import sys, os, shutil, optparse, tarfile, subprocess, copy
+import sys, os, shutil, optparse, tarfile, subprocess
 import markdown
 
 sys.path.append(os.getcwd())

diff --git a/todo_and_bugs-to-fix.txt b/todo_and_bugs-to-fix.txt
@@ -14,18 +14,20 @@
 
 	[X] Check that imfit & makeimage still work
 
-	[..] Update add_functions.cpp
+	[X] Update add_functions.cpp
 		[ ] May need to update defintion or calls to AddFunctions() in PyImfit
-			-- we added optional final parameter globalFuncFlags
+			-- we added optional final (optional) parameter globalFuncFlags
 
 	[X] Check that imfit & makeimage still work
 
 	[X] Continue trying to compile makemultimages
 
-	[ ] Copy in tests and test files from multimfit
-		[ ] tests for makemultimages
-		[ ] tests for multimfit
+	[X] Copy in tests and test files from multimfit
+		[X] tests for makemultimages
+		[X] tests for multimfit
 
+[ ] Update distribution_manifest.py
+	[ ] Update test files for regression tests
 
 [ ] Copy extra functions from imfit_hg to imfit
 	-- i.e., those functions that aren't in the repos