Renaming dr2_sl and fixing numpy deprecation

gaiaverse · Jun 3, 2021 · 6e8fa53 · 6e8fa53
1 parent 0fbeb6d
commit 6e8fa53
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 81 deletions.
diff --git a/scanninglaw/examples/asf.ipynb b/scanninglaw/examples/asf.ipynb
@@ -364,9 +364,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "py36",
+   "display_name": "Python [conda env:gaiaedr3]",
    "language": "python",
-   "name": "py36"
+   "name": "conda-env-gaiaedr3-py"
   },
   "language_info": {
    "codemirror_mode": {
@@ -378,9 +378,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.13"
+   "version": "3.7.10"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/scanninglaw/examples/scanninglaw_demo.ipynb b/scanninglaw/examples/scanninglaw_demo.ipynb
diff --git a/scanninglaw/times.py b/scanninglaw/times.py
@@ -69,7 +69,7 @@
 
 
 
-class dr2_sl(ScanningLaw):
+class Times(ScanningLaw):
     """
     Queries the Gaia DR2 selection function (Boubert & Everall, 2019).
     """
@@ -540,17 +540,17 @@ def query(self, sources, return_times=True, return_counts=True, return_fractions
             # tgaia_fov2 = np.array(tgaia_fov2).reshape(coord_shape)
             # b_fov1 = np.array(b_fov1).reshape(coord_shape)
             # b_fov2 = np.array(b_fov2).reshape(coord_shape)
-            fraction_fov1 = np.array(fraction_fov1).reshape(coord_shape)
-            fraction_fov2 = np.array(fraction_fov2).reshape(coord_shape)
-
-        tgaia_fov1 = np.array(tgaia_fov1).reshape(coord_shape)
-        tgaia_fov2 = np.array(tgaia_fov2).reshape(coord_shape)
-        b_fov1 = np.array(b_fov1).reshape(coord_shape)
-        b_fov2 = np.array(b_fov2).reshape(coord_shape)
-        angle_fov1 = np.array(angle_fov1).reshape(coord_shape)
-        angle_fov2 = np.array(angle_fov2).reshape(coord_shape)
-        nscan_fov1 = np.array(nscan_fov1).reshape(coord_shape)
-        nscan_fov2 = np.array(nscan_fov2).reshape(coord_shape)
+            fraction_fov1 = np.array(fraction_fov1,dtype=object).reshape(coord_shape)
+            fraction_fov2 = np.array(fraction_fov2,dtype=object).reshape(coord_shape)
+
+        tgaia_fov1 = np.array(tgaia_fov1,dtype=object).reshape(coord_shape)
+        tgaia_fov2 = np.array(tgaia_fov2,dtype=object).reshape(coord_shape)
+        b_fov1 = np.array(b_fov1,dtype=object).reshape(coord_shape)
+        b_fov2 = np.array(b_fov2,dtype=object).reshape(coord_shape)
+        angle_fov1 = np.array(angle_fov1,dtype=object).reshape(coord_shape)
+        angle_fov2 = np.array(angle_fov2,dtype=object).reshape(coord_shape)
+        nscan_fov1 = np.array(nscan_fov1,dtype=object).reshape(coord_shape)
+        nscan_fov2 = np.array(nscan_fov2,dtype=object).reshape(coord_shape)
 
         ret = {}
         if return_times: ret['times']=[]

diff --git a/setup.py b/setup.py
@@ -92,12 +92,12 @@ def readme():
 
 setup(
     name='scanninglaw',
-    version='1.1.0',
+    version='1.1.1',
     description='Easy-to-use portal to the Gaia scanning law.',
     long_description=readme(),
     long_description_content_type='text/markdown',
     url='https://github.com/gaiaverse/scanninglaw',
-    download_url='https://github.com/gaiaverse/scanninglaw/archive/v1.1.0.tar.gz',
+    download_url='https://github.com/gaiaverse/scanninglaw/archive/v1.1.1.tar.gz',
     author='Douglas Boubert',
     author_email='douglasboubert@gmail.com',
     license='GPLv2',