fastlisaresponse 1.0.2__tar.gz → 1.0.4__tar.gz

{fastlisaresponse-1.0.2 → fastlisaresponse-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlisaresponse
-Version: 1.0.2
+Version: 1.0.4
 Home-page: https://github.com/mikekatz04/lisa-on-gpu
 Author: Michael Katz
 Author-email: mikekatz04@gmail.com
@@ -10,8 +10,8 @@ Classifier: Environment :: GPU :: NVIDIA CUDA
 Classifier: Natural Language :: English
 Classifier: Programming Language :: C++
 Classifier: Programming Language :: Cython
-Classifier: Programming Language :: Python :: 3.7
-Requires-Python: >=3.6
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 
 # fastlisaresponse: Generic LISA response function for GPUs
@@ -20,7 +20,9 @@ This code base provides a GPU-accelerated version of the generic time-domain LIS
 
 Please see the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) for further information on these modules. The code can be found on Github [here](https://github.com/mikekatz04/lisa-on-gpu). It can be found on # TODO fix [Zenodo](https://zenodo.org/record/3981654#.XzS_KRNKjlw).
 
-If you use all or any parts of this code, please cite (TODO: fill in ). See the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) to properly cite specific modules.
+If you use all or any parts of this code, please cite [arXiv:2204.06633](https://arxiv.org/abs/2204.06633). See the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) to properly cite specific modules.
+
+**Warning**: newest version (1.0.4) of code with `lisatools` orbits needs detailed testing before deployed for a paper.
 
 ## Getting Started
 
@@ -114,7 +116,7 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduc
 
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/mikekatz04/lisa-on-gpu/tags).
 
-Current Version: 1.0.2
+Current Version: 1.0.4
 
 ## Authors
 

{fastlisaresponse-1.0.2 → fastlisaresponse-1.0.4}/README.md

@@ -4,7 +4,9 @@ This code base provides a GPU-accelerated version of the generic time-domain LIS
 
 Please see the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) for further information on these modules. The code can be found on Github [here](https://github.com/mikekatz04/lisa-on-gpu). It can be found on # TODO fix [Zenodo](https://zenodo.org/record/3981654#.XzS_KRNKjlw).
 
-If you use all or any parts of this code, please cite (TODO: fill in ). See the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) to properly cite specific modules.
+If you use all or any parts of this code, please cite [arXiv:2204.06633](https://arxiv.org/abs/2204.06633). See the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) to properly cite specific modules.
+
+**Warning**: newest version (1.0.4) of code with `lisatools` orbits needs detailed testing before deployed for a paper.
 
 ## Getting Started
 
@@ -98,7 +100,7 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduc
 
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/mikekatz04/lisa-on-gpu/tags).
 
-Current Version: 1.0.2
+Current Version: 1.0.4
 
 ## Authors
 

fastlisaresponse-1.0.4/fastlisaresponse/_version.py

@@ -0,0 +1 @@
+__version__ = '1.0.4'

{fastlisaresponse-1.0.2 → fastlisaresponse-1.0.4}/fastlisaresponse/response.py

@@ -18,7 +18,6 @@ except (ImportError, ModuleNotFoundError) as e:
 
     gpu = False
 
-from .cutils.detector import pycppdetector as pycppdetector_here
 from pyresponse_cpu import get_response_wrap as get_response_wrap_cpu
 from pyresponse_cpu import get_tdi_delays_wrap as get_tdi_delays_wrap_cpu
 import time
@@ -57,7 +56,7 @@ class pyResponseTDI(object):
     the response for these orbits numerically. This includes both the projection
     of the gravitational waves onto the LISA constellation arms and combinations \
     of projections into TDI observables. The methods and maths used can be found
-    in # TODO: add url for paper.
+    [here](https://arxiv.org/abs/2204.06633).
 
     This class is also GPU-accelerated, which is very helpful for Bayesian inference
     methods.
@@ -65,12 +64,6 @@ class pyResponseTDI(object):
     Args:
         sampling_frequency (double): The sampling rate in Hz.
         num_pts (int): Number of points to produce for the final output template.
-        orbit_kwargs (dict): Dictionary containing orbital information. The kwargs and defaults
-            are: :code:`orbit_module=None, order=0, max_t_orbits=3.15576e7, orbit_file=None`.
-            :code:`orbit_module` is an orbit module from the LDC package. :code:`max_t_orbits` is
-            the maximum time desired for the orbital information. `orbit_file` is
-            an h5 file of the form used `here <https://gitlab.in2p3.fr/lisa-simulation/orbits>`_.
-            :code:`order` is the order of interpolation used in the orbit modules.
         order (int, optional): Order of Lagrangian interpolation technique. Lower orders
             will be faster. The user must make sure the order is sufficient for the
             waveform being used. (default: 25)
@@ -84,15 +77,15 @@ class pyResponseTDI(object):
             ``'sign'`` is the sign in front of the contribution to the TDI observable. It takes the value of `+1` or `-1`.
             ``type`` is either ``"delay"`` or ``"advance"``. It is optional and defaults to ``"delay"``.
             (default: ``"1st generation"``)
-        tdi_orbit_kwargs (dict, optional): Same as :code:`orbit_kwargs`, but specifically for the TDI
-            portion of the response computation. This allows the user to use two different orbits
-            for the projections and TDI. For example, this can be used to examine the efficacy of
-            frequency domain TDI codes that can handle generic orbits for the projections, but
-            assume equal armlength orbits to reduce and simplify the expression for TDI
-            computations. (default: :code:`None`, this means the orbits for the projections
-            and TDI will be the same and will be built from :code:`orbit_kwargs`)
+        orbits (:class:`Orbits`, optional): Orbits class from LISA Analysis Tools. Works with LISA Orbits 
+            outputs: `lisa-simulation.pages.in2p3.fr/orbits/ <https://lisa-simulation.pages.in2p3.fr/orbits/latest/>`_.
+            (default: :class:`EqualArmlengthOrbits`)
         tdi_chan (str, optional): Which TDI channel combination to return. Choices are :code:`'XYZ'`,
             :code:`AET`, or :code:`AE`. (default: :code:`'XYZ'`)
+        tdi_orbits (:class:`Orbits`, optional): Set if different orbits from projection.
+            Orbits class from LISA Analysis Tools. Works with LISA Orbits 
+            outputs: `lisa-simulation.pages.in2p3.fr/orbits/ <https://lisa-simulation.pages.in2p3.fr/orbits/latest/>`_.
+            (default: :class:`EqualArmlengthOrbits`)
         use_gpu (bool, optional): If True, run code on the GPU. (default: :code:`False`)
 
     Attributes:
@@ -119,20 +112,12 @@ class pyResponseTDI(object):
             interpolation. This is hard coded to 1001.
         num_channels (int): 3.
         num_pts (int): Number of points to produce for the final output template.
-        num_tdi_combinations (int): Number of independent arm computations.
-        num_tdi_delay_comps (int): Number of independent arm computations that require delays.
-        orbits_store (dict): Contains orbital information for the projection and TDI
-            steps.
         order (int): Order of Lagrangian interpolation technique.
         response_gen (func): Projection generator function.
         sampling_frequency (double): The sampling rate in Hz.
         tdi (str or list): TDI setup.
         tdi_buffer (int): The buffer necessary for all information needed at early times
             for the TDI computation. This is set to 200.
-        tdi_chan (str): Which TDI channel combination to return.
-        tdi_delays (xp.ndarray): TDI delays.
-        tdi_gen (func): TDI generating function.
-        tdi_signs (xp.ndarray): Signs applied to the addition of a delayed link. (+1 or -1)
         use_gpu (bool): If True, run on GPU.
         xp (obj): Either Numpy or Cupy.
 
@@ -216,8 +201,6 @@ class pyResponseTDI(object):
 
         assert isinstance(orbits, Orbits)
 
-        orbits.pycppdetector_base = pycppdetector_here
-
         self._response_orbits = deepcopy(orbits)
 
         if not self._response_orbits.configured:
@@ -237,7 +220,6 @@ class pyResponseTDI(object):
 
         assert isinstance(orbits, Orbits)
 
-        orbits.pycppdetector_base = pycppdetector_here
         self._tdi_orbits = deepcopy(orbits)
 
         if not self._tdi_orbits.configured:

{fastlisaresponse-1.0.2 → fastlisaresponse-1.0.4}/fastlisaresponse.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlisaresponse
-Version: 1.0.2
+Version: 1.0.4
 Home-page: https://github.com/mikekatz04/lisa-on-gpu
 Author: Michael Katz
 Author-email: mikekatz04@gmail.com
@@ -10,8 +10,8 @@ Classifier: Environment :: GPU :: NVIDIA CUDA
 Classifier: Natural Language :: English
 Classifier: Programming Language :: C++
 Classifier: Programming Language :: Cython
-Classifier: Programming Language :: Python :: 3.7
-Requires-Python: >=3.6
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 
 # fastlisaresponse: Generic LISA response function for GPUs
@@ -20,7 +20,9 @@ This code base provides a GPU-accelerated version of the generic time-domain LIS
 
 Please see the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) for further information on these modules. The code can be found on Github [here](https://github.com/mikekatz04/lisa-on-gpu). It can be found on # TODO fix [Zenodo](https://zenodo.org/record/3981654#.XzS_KRNKjlw).
 
-If you use all or any parts of this code, please cite (TODO: fill in ). See the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) to properly cite specific modules.
+If you use all or any parts of this code, please cite [arXiv:2204.06633](https://arxiv.org/abs/2204.06633). See the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) to properly cite specific modules.
+
+**Warning**: newest version (1.0.4) of code with `lisatools` orbits needs detailed testing before deployed for a paper.
 
 ## Getting Started
 
@@ -114,7 +116,7 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduc
 
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/mikekatz04/lisa-on-gpu/tags).
 
-Current Version: 1.0.2
+Current Version: 1.0.4
 
 ## Authors
 

{fastlisaresponse-1.0.2 → fastlisaresponse-1.0.4}/scripts/prebuild.py

@@ -24,21 +24,21 @@ with open("fastlisaresponse/_version.py", "w") as f:
 import requests
 
 r = requests.get(
-    "https://raw.githubusercontent.com/mikekatz04/LISAanalysistools/dev2/src/Detector.cpp"
+    "https://raw.githubusercontent.com/mikekatz04/LISAanalysistools/main/src/Detector.cpp"
 )
 
 with open("src/Detector.cpp", "wb") as f:
     f.write(r.content)
 
 r = requests.get(
-    "https://raw.githubusercontent.com/mikekatz04/LISAanalysistools/dev2/include/Detector.hpp"
+    "https://raw.githubusercontent.com/mikekatz04/LISAanalysistools/main/include/Detector.hpp"
 )
 
 with open("include/Detector.hpp", "wb") as f:
     f.write(r.content)
 
 r = requests.get(
-    "https://raw.githubusercontent.com/mikekatz04/LISAanalysistools/dev2/src/pycppdetector.pyx"
+    "https://raw.githubusercontent.com/mikekatz04/LISAanalysistools/main/src/pycppdetector.pyx"
 )
 
 with open("src/pycppdetector.pyx", "wb") as f:

{fastlisaresponse-1.0.2 → fastlisaresponse-1.0.4}/setup.py

@@ -225,13 +225,13 @@ setup(
     author_email="mikekatz04@gmail.com",
     ext_modules=extensions,
     # Inject our custom trigger
-    packages=["fastlisaresponse", "fastlisaresponse.utils", "fastlisaresponse.cutils"],
+    packages=["fastlisaresponse", "fastlisaresponse.utils"],
     cmdclass={"build_ext": custom_build_ext},
     # Since the package has c code, the egg cannot be zipped
     zip_safe=False,
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="1.0.2",
+    version="1.0.4",
     url="https://github.com/mikekatz04/lisa-on-gpu",
     classifiers=[
         "Programming Language :: Python :: 3",
@@ -240,7 +240,7 @@ setup(
         "Natural Language :: English",
         "Programming Language :: C++",
         "Programming Language :: Cython",
-        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.12",
     ],
-    python_requires=">=3.6",
+    python_requires=">=3.12",
 )

{fastlisaresponse-1.0.2 → fastlisaresponse-1.0.4}/src/Detector.cpp

@@ -67,8 +67,8 @@ double Orbits::interpolate(double t, double *in_arr, int window, int major_ndim,
 
     // m *(x - x0) + y0
     double fin = ((up - down) / dt) * (t - (dt * window)) + down;
-    if ((ndim == 1))
-        printf("%d %e %e %e %e \n", window, fin, down, up, (t - (dt * window)));
+    // if ((ndim == 1))
+    //     printf("%d %e %e %e %e \n", window, fin, down, up, (t - (dt * window)));
 
     return fin;
 }