Merge pull request DOI-USGS#133 from amystamile-usgs/cmp-notebooks

Clean up comparison notebooks and fix vis.py
jrcain-usgs · May 22, 2024 · 459231a · 459231a
2 parents c950c03 + 2e41dc7
commit 459231a
Show file tree

Hide file tree

Showing 14 changed files with 904 additions and 22,939 deletions.
diff --git a/README.md b/README.md
@@ -59,21 +59,3 @@ To build the docs:
 1. Browse to the `index.html` file in `docs/public` to open the docs.  If needed, run a utility like `http-server` in the `docs/public` directory to serve the docs on localhost.
 
 <hr>
-
-## Status Report - November 2019
-
-For full testing reports and example usage, please see the linked example Jupyter notebooks in the table below. 
-
-|       Instrument      |                      Jupyter Notebooks                     |  Production Ready |    Difference CSM -> ISIS (in pixels)   |    Difference ISIS -> CSM (in pixels)   |
-|:---------------------:|:-------------------------------------------------:|:-----------------:|:---------------------------------------:|:---------------------------------------:|
-|       MRO HiRISE      |     [link](examples/mro_hirise_isis_cmp.ipynb)    |     sub-pixel; in testing for production    | sample mean=-2.0e-05; line mean=2.5e-08 | sample mean=-3.0e-08; line mean=1.2e-04 |
-|        MRO CTX        |      [link](examples/mro_ctx_isis_cmp.ipynb)      | nearly sub-pixel; still in research |  gross error in line  |     sample mean=0.0002; line mean=-0.07     |
-|        MEX HRSC       |      [link](examples/mex_hrsc_isis_cmp.ipynb)     |         sub-pixel; in testing for production        |      sample mean=0.000038; line mean=-0.000072      |       sample mean=-0.000038 ; line mean=-7.512e-05       |
-|        LROC NAC       |      [link](examples/lrocnac_isis_cmp.ipynb)      | sub-pixel; in testing for production |      sample mean=-0.003; line mean=-0.0006      |                   sample mean=0.0005	line mean=0.003                   |
-| Kaguya Terrain Camera |     [link](examples/kaguya_tc_isis_cmp.ipynb)     | barely sub-pixel; in testing |     sample mean=0.0001; line mean=0.00003    |      sample mean=0.009; line mean=-1.242      |
-|   Messenger MDIS NAC  | [link](examples/messenger_mdisnac_isis_cmp.ipynb) |  sub-pixel; in testing for production |      sample mean=-0.01; line mean=-0.003     |       sample mean=0.01; line mean=0.003      |
-|  Cassini ISS NAC      |      [link](examples/cassini_isis_nac_cmp.ipynb)      |  sub-pixel; in testing for production  |    sample mean=-0.001; line mean=0.01    |     sample mean=0.001; line mean=-0.01     |
-|  Cassini ISS WAC      |      [link](examples/cassini_isis_wac_cmp.ipynb)      |  sub-pixel; in testing for production  |    sample mean=0.001; line mean=0.004    |     sample mean=-0.001; line mean=-0.004     |
-|  Dawn Framing Camera  |      [link](examples/dawn_fc_isis_cmp.ipynb)      |     sub-pixel; in testing for production    | sample mean=-0.02; line mean=0.003 | sample mean=0.02; line mean=-0.003 |
-
-The Difference column (CSM -> ISIS) represents the mean difference in pixels from running usgscsm's *image2ground* and then back to the camera using ISIS3's *campt* (ground2image). The Difference column (ISIS -> CSM) is simply the reverse starting with ISIS3 first with *campt* (image2ground) and then usgscsm's *ground2image*.
diff --git a/examples/cassini_isis_nac_cmp.ipynb b/examples/cassini_isis_nac_cmp.ipynb
diff --git a/examples/cassini_isis_wac_cmp.ipynb b/examples/cassini_isis_wac_cmp.ipynb
diff --git a/examples/data/N1702360370_1.IMG b/examples/data/N1702360370_1.IMG
diff --git a/examples/data/N1702360370_1.LBL b/examples/data/N1702360370_1.LBL
diff --git a/examples/dawn_fc_isis_cmp.ipynb b/examples/dawn_fc_isis_cmp.ipynb
diff --git a/examples/kaguya_tc_isis_cmp.ipynb b/examples/kaguya_tc_isis_cmp.ipynb
diff --git a/examples/lrocnac_isis_cmp.ipynb b/examples/lrocnac_isis_cmp.ipynb
diff --git a/examples/messenger_mdisnac_isis_cmp.ipynb b/examples/messenger_mdisnac_isis_cmp.ipynb
diff --git a/examples/mex_hrsc_isis_cmp.ipynb b/examples/mex_hrsc_isis_cmp.ipynb
diff --git a/examples/mro_ctx_isis_cmp.ipynb b/examples/mro_ctx_isis_cmp.ipynb
diff --git a/examples/mro_hirise_isis_cmp.ipynb b/examples/mro_hirise_isis_cmp.ipynb
diff --git a/examples/usgscsm_isis_cmp.ipynb b/examples/usgscsm_isis_cmp.ipynb
diff --git a/knoten/vis.py b/knoten/vis.py
@@ -134,8 +134,6 @@ def point_info(cube_path, x, y, point_type, allow_outside=False):
 
 
 def plot_diff(data, title='diff plot', colx='x', coly='y', coldx='diffx', coldy='diffy', colmag='magnitude', width=500, height=500):
-    import matplotlib.cm as cm
-    from matplotlib.colors import Normalize
 
     fig = make_subplots(rows=2, cols=2, column_widths=[0.9, .1], row_width=[.9, .1],
                         shared_xaxes=True, shared_yaxes=True, horizontal_spacing = 0.01, vertical_spacing = 0.01)
@@ -175,7 +173,7 @@ def plot_diff(data, title='diff plot', colx='x', coly='y', coldx='diffx', coldy=
                         colorscale="viridis",
                 )), row=2, col=1)
 
-    xavg = data.groupby(colx).apply(np.mean)
+    xavg = data.groupby(colx).mean()
     fig.add_trace(go.Scatter(x=xavg.index, y=xavg[colmag],
         customdata=xavg,
         name=f'{colx} mean error',
@@ -187,7 +185,7 @@ def plot_diff(data, title='diff plot', colx='x', coly='y', coldx='diffx', coldy=
                 colorscale="viridis",
         )), row=1, col=1)
 
-    yavg = data.groupby(coly).apply(np.mean)
+    yavg = data.groupby(coly).mean()
     fig.add_trace(go.Scatter(x=yavg[colmag],y=yavg.index,
         customdata=yavg,
         name=f'{coly} mean error',