Merge pull request #48 from ToFuProject/Issue045_BetterMoments

Issue045 better moments
ToFuProject · Aug 5, 2024 · d37a429 · d37a429
2 parents c94bcff + c1cf12f
commit d37a429
Show file tree

Hide file tree

Showing 4 changed files with 402 additions and 159 deletions.
diff --git a/spectrally/_class01_SpectralModel.py b/spectrally/_class01_SpectralModel.py
@@ -202,6 +202,7 @@ def get_spectral_model_moments(
         key=None,
         key_data=None,
         lamb=None,
+        returnas=None,
     ):
         """
 
@@ -221,6 +222,10 @@ def get_spectral_model_moments(
             key to the data to be used as input for the model's free variables
         lamb:str or 1d np.ndarray, optional
             wavelenth vector to be used for computing limited integrals
+        returnas: str
+            Flag indicating whether to return dout as:
+                - 'dict_arrays': nested dict of {'ktype': {'kvar': array}}
+                - 'dict_varnames': dict of {'kfunc_var': values}
 
         Returns
         -------
@@ -234,6 +239,7 @@ def get_spectral_model_moments(
             key=key,
             key_data=key_data,
             lamb=lamb,
+            returnas=returnas,
         )
 
         return dout