lisaanalysistools 1.0.8__tar.gz → 1.0.10__tar.gz

{lisaanalysistools-1.0.8 → lisaanalysistools-1.0.10/LISAanalysistools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lisaanalysistools
-Version: 1.0.8
+Version: 1.0.10
 Home-page: https://github.com/mikekatz04/LISAanalysistools
 Author: Michael Katz
 Author-email: mikekatz04@gmail.com
@@ -40,7 +40,7 @@ LISA Analysis Tools leverages conda environments to install and use necessary pa
 
 For an easy full install, follow these instructions.
 
-First, clone the repo and `cd` to the `LATW` directory.:
+First, clone the repo and `cd` to the `LISAanalysistools` directory.:
 ```
 git clone https://github.com/mikekatz04/LISAanalysistools.git
 cd LISAanalysistools/
@@ -56,7 +56,7 @@ If you want more flexibility, you can install each package given above separatel
 
 To install this software for use with NVIDIA GPUs (compute capability >5.0), you need the [CUDA toolkit](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html) and [CuPy](https://cupy.chainer.org/). The CUDA toolkit must have cuda version >8.0. Be sure to properly install CuPy within the correct CUDA toolkit version. Make sure the nvcc binary is on `$PATH` or set it as the `CUDA_HOME` environment variable.
 
-We are currently working on building wheels and making the GPU version pip installable. For now, to work with GPUs, git clone the repository and install it from source. 
+We are currently working on building wheels and making the GPU version pip installable. For now, to work with GPUs, git clone the repository and install it from source. You must run `python scripts/prebuild.py` before running the install process.  
 
 ## Contributing
 
@@ -66,7 +66,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/LISAanalysistools/tags).
 
-Current Version: 1.0.8
+Current Version: 1.0.10
 
 ## Authors/Developers
 

{lisaanalysistools-1.0.8 → lisaanalysistools-1.0.10}/LISAanalysistools.egg-info/SOURCES.txt

@@ -43,8 +43,15 @@ lisatools/sampling/utility.py
 lisatools/sampling/moves/__init__.py
 lisatools/sampling/moves/skymodehop.py
 lisatools/sources/__init__.py
+lisatools/sources/defaultresponse.py
+lisatools/sources/utils.py
+lisatools/sources/waveformbase.py
+lisatools/sources/bbh/__init__.py
+lisatools/sources/bbh/waveform.py
 lisatools/sources/emri/__init__.py
-lisatools/sources/emri/tdiwaveform.py
+lisatools/sources/emri/waveform.py
+lisatools/sources/gb/__init__.py
+lisatools/sources/gb/waveform.py
 lisatools/utils/__init__.py
 lisatools/utils/constants.py
 lisatools/utils/pointeradjust.py

{lisaanalysistools-1.0.8/LISAanalysistools.egg-info → lisaanalysistools-1.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lisaanalysistools
-Version: 1.0.8
+Version: 1.0.10
 Home-page: https://github.com/mikekatz04/LISAanalysistools
 Author: Michael Katz
 Author-email: mikekatz04@gmail.com
@@ -40,7 +40,7 @@ LISA Analysis Tools leverages conda environments to install and use necessary pa
 
 For an easy full install, follow these instructions.
 
-First, clone the repo and `cd` to the `LATW` directory.:
+First, clone the repo and `cd` to the `LISAanalysistools` directory.:
 ```
 git clone https://github.com/mikekatz04/LISAanalysistools.git
 cd LISAanalysistools/
@@ -56,7 +56,7 @@ If you want more flexibility, you can install each package given above separatel
 
 To install this software for use with NVIDIA GPUs (compute capability >5.0), you need the [CUDA toolkit](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html) and [CuPy](https://cupy.chainer.org/). The CUDA toolkit must have cuda version >8.0. Be sure to properly install CuPy within the correct CUDA toolkit version. Make sure the nvcc binary is on `$PATH` or set it as the `CUDA_HOME` environment variable.
 
-We are currently working on building wheels and making the GPU version pip installable. For now, to work with GPUs, git clone the repository and install it from source. 
+We are currently working on building wheels and making the GPU version pip installable. For now, to work with GPUs, git clone the repository and install it from source. You must run `python scripts/prebuild.py` before running the install process.  
 
 ## Contributing
 
@@ -66,7 +66,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/LISAanalysistools/tags).
 
-Current Version: 1.0.8
+Current Version: 1.0.10
 
 ## Authors/Developers
 

{lisaanalysistools-1.0.8 → lisaanalysistools-1.0.10}/README.md

@@ -23,7 +23,7 @@ LISA Analysis Tools leverages conda environments to install and use necessary pa
 
 For an easy full install, follow these instructions.
 
-First, clone the repo and `cd` to the `LATW` directory.:
+First, clone the repo and `cd` to the `LISAanalysistools` directory.:
 ```
 git clone https://github.com/mikekatz04/LISAanalysistools.git
 cd LISAanalysistools/
@@ -39,7 +39,7 @@ If you want more flexibility, you can install each package given above separatel
 
 To install this software for use with NVIDIA GPUs (compute capability >5.0), you need the [CUDA toolkit](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html) and [CuPy](https://cupy.chainer.org/). The CUDA toolkit must have cuda version >8.0. Be sure to properly install CuPy within the correct CUDA toolkit version. Make sure the nvcc binary is on `$PATH` or set it as the `CUDA_HOME` environment variable.
 
-We are currently working on building wheels and making the GPU version pip installable. For now, to work with GPUs, git clone the repository and install it from source. 
+We are currently working on building wheels and making the GPU version pip installable. For now, to work with GPUs, git clone the repository and install it from source. You must run `python scripts/prebuild.py` before running the install process.  
 
 ## Contributing
 
@@ -49,7 +49,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/LISAanalysistools/tags).
 
-Current Version: 1.0.8
+Current Version: 1.0.10
 
 ## Authors/Developers
 

{lisaanalysistools-1.0.8 → lisaanalysistools-1.0.10}/lisatools/_version.py

@@ -1,4 +1,4 @@
-__version__ = '1.0.8'
+__version__ = '1.0.10'
 __copyright__ = "Michael L. Katz 2024"
 __name__ = "lisaanalysistools"
 __author__ = "Michael L. Katz"

{lisaanalysistools-1.0.8 → lisaanalysistools-1.0.10}/lisatools/analysiscontainer.py

@@ -112,17 +112,17 @@ class AnalysisContainer:
                     # char strain
                     ax[i * self.sens_mat.shape[1] + j].loglog(
                         self.data_res_arr.f_arr,
-                        self.data_res_arr.f_arr * self.data_res_arr[i],
+                        self.data_res_arr.f_arr * np.abs(self.data_res_arr[i]),
                     )
                     ax[i * self.sens_mat.shape[1] + j].loglog(
                         self.data_res_arr.f_arr,
-                        self.data_res_arr.f_arr * self.data_res_arr[j],
+                        self.data_res_arr.f_arr * np.abs(self.data_res_arr[j]),
                     )
         else:
             for i in range(self.sens_mat.shape[0]):
                 ax[i].loglog(
                     self.data_res_arr.f_arr,
-                    self.data_res_arr.f_arr * self.data_res_arr[i],
+                    self.data_res_arr.f_arr * np.abs(self.data_res_arr[i]),
                 )
         return (fig, ax)
 

{lisaanalysistools-1.0.8 → lisaanalysistools-1.0.10}/lisatools/cutils/include/Detector.hpp

@@ -30,11 +30,12 @@ public:
     double *x_arr;
     int nlinks;
     int nspacecraft;
+    double armlength;
     int *links;
     int *sc_r;
     int *sc_e;
 
-    Orbits(double dt_, int N_, double *n_arr_, double *ltt_arr_, double *x_arr_, int *links_, int *sc_r_, int *sc_e_)
+    Orbits(double dt_, int N_, double *n_arr_, double *ltt_arr_, double *x_arr_, int *links_, int *sc_r_, int *sc_e_, double armlength_)
     {
         dt = dt_;
         N = N_;
@@ -47,15 +48,22 @@ public:
         sc_r = sc_r_;
         sc_e = sc_e_;
         links = links_;
+        armlength = armlength_;
+    };
 
-        // std::cout << " START " << std::endl;
-        // for (int i = 0; i < nlinks; i += 1)
-        // {
-        //     sc_r[i] = sc_r_[i];
-        //     sc_e[i] = sc_e_[i];
-        //     links[i] = links_[i];
-        //     // std::cout << i << " HAHAHAH " << sc_r_[i] << " " << sc_e_[i] << std::endl;
-        // }
+    int get_sc_r_from_arr(int i)
+    {
+        return sc_r[i];
+    };
+
+    int get_sc_e_from_arr(int i)
+    {
+        return sc_e[i];
+    };
+
+    int get_link_from_arr(int i)
+    {
+        return links[i];
     };
 
     CUDA_DEVICE int get_window(double t);
@@ -68,11 +76,9 @@ public:
     CUDA_DEVICE void get_normal_unit_vec_ptr(Vec *vec, double t, int link);
     CUDA_DEVICE void get_pos_ptr(Vec *vec, double t, int sc);
     void get_light_travel_time_arr(double *ltt, double *t, int *link, int num);
-    void dealloc(){
-        // delete[] links;
-        // delete[] sc_r;
-        // delete[] sc_e;
-    };
+    void get_pos_arr(double *pos_x, double *pos_y, double *pos_z, double *t, int *sc, int num);
+    void get_normal_unit_vec_arr(double *normal_unit_vec_x, double *normal_unit_vec_y, double *normal_unit_vec_z, double *t, int *link, int num);
+    void dealloc() {};
 };
 
 #endif // __DETECTOR_HPP__

{lisaanalysistools-1.0.8 → lisaanalysistools-1.0.10}/lisatools/cutils/src/Detector.cpp

@@ -55,8 +55,7 @@ int Orbits::get_sc_ind(int sc)
         printf("BAD sc ind. Must be 1,2,3. %d\n", sc);
 #else
         std::ostringstream oss;
-        int xxxx = 1;
-        oss << "Bad sc ind. Must be 1,2,3. Input sc is " << sc << " " << xxxx;
+        oss << "Bad sc ind. Must be 1,2,3. Input sc is " << sc << " " << std::endl;
         std::string var = oss.str();
         throw std::invalid_argument(var);
 #endif // __CUDACC__
@@ -166,19 +165,20 @@ void Orbits::get_pos_ptr(Vec *vec, double t, int sc)
 
 #define NUM_THREADS 64
 
+
 CUDA_KERNEL
-void get_light_travel_time_kernel(double *ltt, double *t, int *link, int num, Orbits& orbits)
+void get_light_travel_time_kernel(double *ltt, double *t, int *link, int num, Orbits &orbits)
 {
     int start, end, increment;
-    #ifdef __CUDACC__
+#ifdef __CUDACC__
     start = blockIdx.x * blockDim.x + threadIdx.x;
     end = num;
     increment = gridDim.x * blockDim.x;
-    #else // __CUDACC__
+#else  // __CUDACC__
     start = 0;
     end = num;
     increment = 1;
-    #endif // __CUDACC__
+#endif // __CUDACC__
 
     for (int i = start; i < end; i += increment)
     {
@@ -188,7 +188,7 @@ void get_light_travel_time_kernel(double *ltt, double *t, int *link, int num, Or
 
 void Orbits::get_light_travel_time_arr(double *ltt, double *t, int *link, int num)
 {
-    #ifdef __CUDACC__
+#ifdef __CUDACC__
     int num_blocks = std::ceil((num + NUM_THREADS - 1) / NUM_THREADS);
 
     // copy self to GPU
@@ -199,12 +199,109 @@ void Orbits::get_light_travel_time_arr(double *ltt, double *t, int *link, int nu
     get_light_travel_time_kernel<<<num_blocks, NUM_THREADS>>>(ltt, t, link, num, *orbits_gpu);
     cudaDeviceSynchronize();
     gpuErrchk(cudaGetLastError());
-    
+
     gpuErrchk(cudaFree(orbits_gpu));
 
-    #else // __CUDACC__
+#else // __CUDACC__
 
     get_light_travel_time_kernel(ltt, t, link, num, *this);
 
-    #endif // __CUDACC__
-}
+#endif // __CUDACC__
+}
+
+
+CUDA_KERNEL
+void get_pos_kernel(double *pos_x, double *pos_y, double *pos_z, double *t, int *sc, int num, Orbits &orbits)
+{
+    int start, end, increment;
+#ifdef __CUDACC__
+    start = blockIdx.x * blockDim.x + threadIdx.x;
+    end = num;
+    increment = gridDim.x * blockDim.x;
+#else  // __CUDACC__
+    start = 0;
+    end = num;
+    increment = 1;
+#endif // __CUDACC__
+    Vec _tmp(0.0, 0.0, 0.0);
+
+    for (int i = start; i < end; i += increment)
+    {
+        _tmp = orbits.get_pos(t[i], sc[i]);
+        pos_x[i] = _tmp.x;
+        pos_y[i] = _tmp.y;
+        pos_z[i] = _tmp.z;
+    }
+}
+
+void Orbits::get_pos_arr(double *pos_x, double *pos_y, double *pos_z, double *t, int *sc, int num)
+{
+#ifdef __CUDACC__
+    int num_blocks = std::ceil((num + NUM_THREADS - 1) / NUM_THREADS);
+
+    // copy self to GPU
+    Orbits *orbits_gpu;
+    gpuErrchk(cudaMalloc(&orbits_gpu, sizeof(Orbits)));
+    gpuErrchk(cudaMemcpy(orbits_gpu, this, sizeof(Orbits), cudaMemcpyHostToDevice));
+
+    get_pos_kernel<<<num_blocks, NUM_THREADS>>>(pos_x, pos_y, pos_z, t, sc, num, *orbits_gpu);
+    cudaDeviceSynchronize();
+    gpuErrchk(cudaGetLastError());
+
+    gpuErrchk(cudaFree(orbits_gpu));
+
+#else // __CUDACC__
+
+    get_pos_kernel(pos_x, pos_y, pos_z, t, sc, num, *this);
+
+#endif // __CUDACC__
+}
+
+
+CUDA_KERNEL
+void get_normal_unit_vec_kernel(double *normal_unit_vec_x, double *normal_unit_vec_y, double *normal_unit_vec_z, double *t, int *link, int num, Orbits &orbits)
+{
+    int start, end, increment;
+#ifdef __CUDACC__
+    start = blockIdx.x * blockDim.x + threadIdx.x;
+    end = num;
+    increment = gridDim.x * blockDim.x;
+#else  // __CUDACC__
+    start = 0;
+    end = num;
+    increment = 1;
+#endif // __CUDACC__
+    Vec _tmp(0.0, 0.0, 0.0);
+
+    for (int i = start; i < end; i += increment)
+    {
+        _tmp = orbits.get_normal_unit_vec(t[i], link[i]);
+        normal_unit_vec_x[i] = _tmp.x;
+        normal_unit_vec_y[i] = _tmp.y;
+        normal_unit_vec_z[i] = _tmp.z;
+    }
+}
+
+void Orbits::get_normal_unit_vec_arr(double *normal_unit_vec_x, double *normal_unit_vec_y, double *normal_unit_vec_z, double *t, int *link, int num)
+{
+#ifdef __CUDACC__
+    int num_blocks = std::ceil((num + NUM_THREADS - 1) / NUM_THREADS);
+
+    // copy self to GPU
+    Orbits *orbits_gpu;
+    gpuErrchk(cudaMalloc(&orbits_gpu, sizeof(Orbits)));
+    gpuErrchk(cudaMemcpy(orbits_gpu, this, sizeof(Orbits), cudaMemcpyHostToDevice));
+
+    get_normal_unit_vec_kernel<<<num_blocks, NUM_THREADS>>>(normal_unit_vec_x, normal_unit_vec_y, normal_unit_vec_z, t, link, num, *orbits_gpu);
+    cudaDeviceSynchronize();
+    gpuErrchk(cudaGetLastError());
+
+    gpuErrchk(cudaFree(orbits_gpu));
+
+#else // __CUDACC__
+
+    get_normal_unit_vec_kernel(normal_unit_vec_x, normal_unit_vec_y, normal_unit_vec_z, t, link, num, *this);
+
+#endif // __CUDACC__
+}
+

{lisaanalysistools-1.0.8 → lisaanalysistools-1.0.10}/lisatools/cutils/src/Detector.cu

@@ -55,8 +55,7 @@ int Orbits::get_sc_ind(int sc)
         printf("BAD sc ind. Must be 1,2,3. %d\n", sc);
 #else
         std::ostringstream oss;
-        int xxxx = 1;
-        oss << "Bad sc ind. Must be 1,2,3. Input sc is " << sc << " " << xxxx;
+        oss << "Bad sc ind. Must be 1,2,3. Input sc is " << sc << " " << std::endl;
         std::string var = oss.str();
         throw std::invalid_argument(var);
 #endif // __CUDACC__
@@ -166,19 +165,20 @@ void Orbits::get_pos_ptr(Vec *vec, double t, int sc)
 
 #define NUM_THREADS 64
 
+
 CUDA_KERNEL
-void get_light_travel_time_kernel(double *ltt, double *t, int *link, int num, Orbits& orbits)
+void get_light_travel_time_kernel(double *ltt, double *t, int *link, int num, Orbits &orbits)
 {
     int start, end, increment;
-    #ifdef __CUDACC__
+#ifdef __CUDACC__
     start = blockIdx.x * blockDim.x + threadIdx.x;
     end = num;
     increment = gridDim.x * blockDim.x;
-    #else // __CUDACC__
+#else  // __CUDACC__
     start = 0;
     end = num;
     increment = 1;
-    #endif // __CUDACC__
+#endif // __CUDACC__
 
     for (int i = start; i < end; i += increment)
     {
@@ -188,7 +188,7 @@ void get_light_travel_time_kernel(double *ltt, double *t, int *link, int num, Or
 
 void Orbits::get_light_travel_time_arr(double *ltt, double *t, int *link, int num)
 {
-    #ifdef __CUDACC__
+#ifdef __CUDACC__
     int num_blocks = std::ceil((num + NUM_THREADS - 1) / NUM_THREADS);
 
     // copy self to GPU
@@ -199,12 +199,109 @@ void Orbits::get_light_travel_time_arr(double *ltt, double *t, int *link, int nu
     get_light_travel_time_kernel<<<num_blocks, NUM_THREADS>>>(ltt, t, link, num, *orbits_gpu);
     cudaDeviceSynchronize();
     gpuErrchk(cudaGetLastError());
-    
+
     gpuErrchk(cudaFree(orbits_gpu));
 
-    #else // __CUDACC__
+#else // __CUDACC__
 
     get_light_travel_time_kernel(ltt, t, link, num, *this);
 
-    #endif // __CUDACC__
-}
+#endif // __CUDACC__
+}
+
+
+CUDA_KERNEL
+void get_pos_kernel(double *pos_x, double *pos_y, double *pos_z, double *t, int *sc, int num, Orbits &orbits)
+{
+    int start, end, increment;
+#ifdef __CUDACC__
+    start = blockIdx.x * blockDim.x + threadIdx.x;
+    end = num;
+    increment = gridDim.x * blockDim.x;
+#else  // __CUDACC__
+    start = 0;
+    end = num;
+    increment = 1;
+#endif // __CUDACC__
+    Vec _tmp(0.0, 0.0, 0.0);
+
+    for (int i = start; i < end; i += increment)
+    {
+        _tmp = orbits.get_pos(t[i], sc[i]);
+        pos_x[i] = _tmp.x;
+        pos_y[i] = _tmp.y;
+        pos_z[i] = _tmp.z;
+    }
+}
+
+void Orbits::get_pos_arr(double *pos_x, double *pos_y, double *pos_z, double *t, int *sc, int num)
+{
+#ifdef __CUDACC__
+    int num_blocks = std::ceil((num + NUM_THREADS - 1) / NUM_THREADS);
+
+    // copy self to GPU
+    Orbits *orbits_gpu;
+    gpuErrchk(cudaMalloc(&orbits_gpu, sizeof(Orbits)));
+    gpuErrchk(cudaMemcpy(orbits_gpu, this, sizeof(Orbits), cudaMemcpyHostToDevice));
+
+    get_pos_kernel<<<num_blocks, NUM_THREADS>>>(pos_x, pos_y, pos_z, t, sc, num, *orbits_gpu);
+    cudaDeviceSynchronize();
+    gpuErrchk(cudaGetLastError());
+
+    gpuErrchk(cudaFree(orbits_gpu));
+
+#else // __CUDACC__
+
+    get_pos_kernel(pos_x, pos_y, pos_z, t, sc, num, *this);
+
+#endif // __CUDACC__
+}
+
+
+CUDA_KERNEL
+void get_normal_unit_vec_kernel(double *normal_unit_vec_x, double *normal_unit_vec_y, double *normal_unit_vec_z, double *t, int *link, int num, Orbits &orbits)
+{
+    int start, end, increment;
+#ifdef __CUDACC__
+    start = blockIdx.x * blockDim.x + threadIdx.x;
+    end = num;
+    increment = gridDim.x * blockDim.x;
+#else  // __CUDACC__
+    start = 0;
+    end = num;
+    increment = 1;
+#endif // __CUDACC__
+    Vec _tmp(0.0, 0.0, 0.0);
+
+    for (int i = start; i < end; i += increment)
+    {
+        _tmp = orbits.get_normal_unit_vec(t[i], link[i]);
+        normal_unit_vec_x[i] = _tmp.x;
+        normal_unit_vec_y[i] = _tmp.y;
+        normal_unit_vec_z[i] = _tmp.z;
+    }
+}
+
+void Orbits::get_normal_unit_vec_arr(double *normal_unit_vec_x, double *normal_unit_vec_y, double *normal_unit_vec_z, double *t, int *link, int num)
+{
+#ifdef __CUDACC__
+    int num_blocks = std::ceil((num + NUM_THREADS - 1) / NUM_THREADS);
+
+    // copy self to GPU
+    Orbits *orbits_gpu;
+    gpuErrchk(cudaMalloc(&orbits_gpu, sizeof(Orbits)));
+    gpuErrchk(cudaMemcpy(orbits_gpu, this, sizeof(Orbits), cudaMemcpyHostToDevice));
+
+    get_normal_unit_vec_kernel<<<num_blocks, NUM_THREADS>>>(normal_unit_vec_x, normal_unit_vec_y, normal_unit_vec_z, t, link, num, *orbits_gpu);
+    cudaDeviceSynchronize();
+    gpuErrchk(cudaGetLastError());
+
+    gpuErrchk(cudaFree(orbits_gpu));
+
+#else // __CUDACC__
+
+    get_normal_unit_vec_kernel(normal_unit_vec_x, normal_unit_vec_y, normal_unit_vec_z, t, link, num, *this);
+
+#endif // __CUDACC__
+}
+

{lisaanalysistools-1.0.8 → lisaanalysistools-1.0.10}/lisatools/cutils/src/pycppdetector.pyx

@@ -14,7 +14,7 @@ cdef extern from "../include/Detector.hpp":
         VecWrap(double x_, double y_, double z_) except+
 
     cdef cppclass OrbitsWrap "Orbits":
-        OrbitsWrap(double dt_, int N_, double *n_arr_, double *L_arr_, double *x_arr_, int *links_, int *sc_r_, int *sc_e_) except+
+        OrbitsWrap(double dt_, int N_, double *n_arr_, double *L_arr_, double *x_arr_, int *links_, int *sc_r_, int *sc_e_, double armlength_) except+
         int get_window(double t) except+
         void get_normal_unit_vec_ptr(VecWrap *vec, double t, int link)
         int get_link_ind(int link) except+
@@ -23,6 +23,11 @@ cdef extern from "../include/Detector.hpp":
         VecWrap get_pos_ptr(VecWrap* out, double t, int sc) except+
         void get_light_travel_time_arr(double *ltt, double *t, int *link, int num) except+
         void dealloc();
+        void get_pos_arr(double *pos_x, double *pos_y, double *pos_z, double *t, int *sc, int num) except+
+        void get_normal_unit_vec_arr(double *normal_unit_vec_x, double *normal_unit_vec_y, double *normal_unit_vec_z, double *t, int *link, int num) except+
+        int get_sc_r_from_arr(int i) except+
+        int get_sc_e_from_arr(int i) except+
+        int get_link_from_arr(int i) except+
         
 
 cdef class pycppDetector:
@@ -35,6 +40,7 @@ cdef class pycppDetector:
     cdef size_t links
     cdef size_t sc_r
     cdef size_t sc_e
+    cdef double armlength
 
     def __cinit__(self, 
         *args, 
@@ -48,7 +54,8 @@ cdef class pycppDetector:
             x_arr,
             links,
             sc_r, 
-            sc_e
+            sc_e,
+            armlength
         ), tkwargs = wrapper(*args, **kwargs)
 
         self.dt = dt
@@ -59,6 +66,7 @@ cdef class pycppDetector:
         self.links = links
         self.sc_r = sc_r
         self.sc_e = sc_e
+        self.armlength = armlength
 
         cdef size_t n_arr_in = n_arr
         cdef size_t L_arr_in = L_arr
@@ -75,7 +83,8 @@ cdef class pycppDetector:
             <double*> x_arr_in, 
             <int*> links_in, 
             <int*> sc_r_in, 
-            <int*> sc_e_in
+            <int*> sc_e_in,
+            armlength
         )
 
     def __dealloc__(self):
@@ -84,7 +93,7 @@ cdef class pycppDetector:
             del self.g
 
     def __reduce__(self):
-        return (rebuild, (self.dt, self.N, self.n_arr, self.L_arr, self.x_arr, self.links, self.sc_r, self.sc_e,))
+        return (rebuild, (self.dt, self.N, self.n_arr, self.L_arr, self.x_arr, self.links, self.sc_r, self.sc_e, self.armlength))
 
     def get_window(self, t: float) -> int:
         return self.g.get_window(t)
@@ -157,6 +166,42 @@ cdef class pycppDetector:
         elif isinstance(t, np.ndarray):
             return self.get_pos_arr(t, sc)
 
+    def get_pos_arr_wrap(self, *args, **kwargs):
+        (pos_x, pos_y, pos_z, t, sc, num), tkwargs = wrapper(*args, **kwargs)
+
+        cdef size_t pos_x_in = pos_x
+        cdef size_t pos_y_in = pos_y
+        cdef size_t pos_z_in = pos_z
+        cdef size_t t_in = t
+        cdef size_t sc_in = sc
+
+        self.g.get_pos_arr(
+            <double *>pos_x_in,
+            <double *>pos_y_in,
+            <double *>pos_z_in,
+            <double *>t_in,
+            <int *>sc_in,
+            num
+        )
+    
+    def get_normal_unit_vec_arr_wrap(self, *args, **kwargs):
+        (normal_unit_vec_x, normal_unit_vec_y, normal_unit_vec_z, t, sc, num), tkwargs = wrapper(*args, **kwargs)
+
+        cdef size_t normal_unit_vec_x_in = normal_unit_vec_x
+        cdef size_t normal_unit_vec_y_in = normal_unit_vec_y
+        cdef size_t normal_unit_vec_z_in = normal_unit_vec_z
+        cdef size_t t_in = t
+        cdef size_t sc_in = sc
+
+        self.g.get_normal_unit_vec_arr(
+            <double *>normal_unit_vec_x_in,
+            <double *>normal_unit_vec_y_in,
+            <double *>normal_unit_vec_z_in,
+            <double *>t_in,
+            <int *>sc_in,
+            num
+        )
+
     def get_light_travel_time_arr_wrap(self, *args, **kwargs):
         (ltt, t, link, num), tkwargs = wrapper(*args, **kwargs)
 
@@ -170,6 +215,15 @@ cdef class pycppDetector:
             <int *>link_in,
             num
         )
+
+    def get_sc_r_from_arr(self, i: int) -> int:
+        return self.g.get_sc_r_from_arr(i)
+
+    def get_sc_e_from_arr(self, i: int) -> int:
+        return self.g.get_sc_e_from_arr(i)
+
+    def get_link_from_arr(self, i: int) -> int:
+        return self.g.get_link_from_arr(i)
         
 
     @property
@@ -184,7 +238,8 @@ def rebuild(dt,
     x_arr,
     links,
     sc_r, 
-    sc_e
+    sc_e,
+    armlength
 ):
     c = pycppDetector(
         dt,
@@ -194,6 +249,7 @@ def rebuild(dt,
         x_arr,
         links,
         sc_r, 
-        sc_e
+        sc_e,
+        armlength
     )
     return c