Merge pull request #16 from LSST-nonproject/SIM-1240

Sim 1240
LSST-nonproject · Jul 29, 2015 · 9ea343d · 9ea343d
2 parents c533072 + c55aebf
commit 9ea343d
Show file tree

Hide file tree

Showing 16 changed files with 797 additions and 630 deletions.
diff --git a/science/slowTransientsVariables/Followup Observatories.ipynb b/science/slowTransientsVariables/Followup Observatories.ipynb
diff --git a/science/slowTransientsVariables/Time Delay Accuracy.ipynb b/science/slowTransientsVariables/Time Delay Accuracy.ipynb
diff --git a/science/solarSystem/NeoDetection.ipynb b/science/solarSystem/NeoDetection.ipynb
diff --git a/science/static/GalaxyCounts.ipynb b/science/static/GalaxyCounts.ipynb
diff --git a/tutorials/Complex Metrics.ipynb b/tutorials/Complex Metrics.ipynb
diff --git a/tutorials/Dithers.ipynb b/tutorials/Dithers.ipynb
diff --git a/tutorials/Getting_MAF_Help.ipynb b/tutorials/Getting_MAF_Help.ipynb
@@ -15,16 +15,7 @@
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "WARNING: AstropyDeprecationWarning: Config parameter 'default_cosmology' in section [astropy.cosmology.core] is deprecated. Use science state astropy.cosmology.core.default_cosmology instead. [astropy.utils.state]\n",
-      "WARNING:astropy:AstropyDeprecationWarning: Config parameter 'default_cosmology' in section [astropy.cosmology.core] is deprecated. Use science state astropy.cosmology.core.default_cosmology instead.\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "# Need to import everything before getting help!\n",
     "import lsst.sims.maf\n",
@@ -36,7 +27,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
@@ -205,7 +196,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 23,
+   "execution_count": 3,
    "metadata": {
     "collapsed": false
    },
@@ -278,7 +269,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": 4,
    "metadata": {
     "collapsed": false
    },
@@ -335,7 +326,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 24,
+   "execution_count": 5,
    "metadata": {
     "collapsed": false
    },
@@ -379,7 +370,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 6,
    "metadata": {
     "collapsed": false
    },
@@ -501,7 +492,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 7,
    "metadata": {
     "collapsed": false
    },
@@ -614,7 +605,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 8,
    "metadata": {
     "collapsed": false
    },
@@ -675,7 +666,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 9,
    "metadata": {
     "collapsed": false
    },
@@ -696,6 +687,7 @@
        " 'OneDBinnedData',\n",
        " 'OneDSubsetData',\n",
        " 'OpsimHistogram',\n",
+       " 'PlotBundle',\n",
        " 'PlotHandler',\n",
        " 'SummaryHistogram',\n",
        " 'TwoDSubsetData',\n",
@@ -709,12 +701,13 @@
        " 'ndPlotters',\n",
        " 'neoDistancePlotter',\n",
        " 'onedPlotters',\n",
+       " 'plotBundle',\n",
        " 'plotHandler',\n",
        " 'spatialPlotters',\n",
        " 'specialPlotters']"
       ]
      },
-     "execution_count": 18,
+     "execution_count": 9,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -726,7 +719,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 10,
    "metadata": {
     "collapsed": false
    },

diff --git a/tutorials/Introduction Notebook.ipynb b/tutorials/Introduction Notebook.ipynb
diff --git a/tutorials/MAFCameraGeom.ipynb b/tutorials/MAFCameraGeom.ipynb
diff --git a/tutorials/Plotting Examples.ipynb b/tutorials/Plotting Examples.ipynb
diff --git a/tutorials/SDSSSlicer.ipynb b/tutorials/SDSSSlicer.ipynb
diff --git a/tutorials/Slicers.ipynb b/tutorials/Slicers.ipynb
diff --git a/tutorials/Stackers.ipynb b/tutorials/Stackers.ipynb
diff --git a/tutorials/TestNotebook.ipynb b/tutorials/TestNotebook.ipynb
@@ -74,7 +74,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "I think I'm in directory  /Users/lynnej/lsstRepos/sims_maf_contrib/tutorials\n"
+      "I think I'm in directory  /Users/lynnej/lsstRepos/sims_maf_contrib\n"
      ]
     }
    ],
@@ -95,7 +95,7 @@
      "output_type": "stream",
      "text": [
       "Notebooks in this directory include: \n",
-      "['CFHT.ipynb', 'Compare Runs.ipynb', 'Complex Metrics.ipynb', 'Dithers.ipynb', 'Index.ipynb', 'Introduction Notebook.ipynb', 'MAFCameraGeom.ipynb', 'Plotting Examples.ipynb', 'Slicers.ipynb', 'Stackers.ipynb', 'TestNotebook.ipynb', 'Writing A New Metric.ipynb']\n"
+      "['Compare Runs.ipynb', 'Complex Metrics.ipynb', 'Dithers.ipynb', 'Getting_MAF_Help.ipynb', 'Index.ipynb', 'Introduction Notebook.ipynb', 'MAFCameraGeom.ipynb', 'Plotting Examples.ipynb', 'SDSSSlicer.ipynb', 'Slicers.ipynb', 'Stackers.ipynb', 'TestNotebook.ipynb', 'Writing A New Metric.ipynb']\n"
      ]
     }
    ],
@@ -148,23 +148,7 @@
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "ename": "ImportError",
-     "evalue": "No module named persistence",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mImportError\u001b[0m                               Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-8-861417b21fc6>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0;32mimport\u001b[0m \u001b[0mlsst\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msims\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mmaf\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mdb\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mdb\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m      2\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mlsst\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msims\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mmaf\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mmetrics\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mmetrics\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      3\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mlsst\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msims\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mmaf\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mslicers\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mslicers\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      4\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mlsst\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msims\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mmaf\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mstackers\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mstackers\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      5\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mlsst\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msims\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mmaf\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mplots\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mplot\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m/Users/lynnej/lsstRepos/sims_maf/python/lsst/sims/maf/db/__init__.py\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mTable\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0;34m*\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m      2\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mDatabase\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0;34m*\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      3\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mopsimDatabase\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0;34m*\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      4\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mresultsDb\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0;34m*\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      5\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mtrackingDb\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0;34m*\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m/Users/lynnej/lsstRepos/sims_maf/python/lsst/sims/maf/db/Table.py\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      9\u001b[0m \u001b[0;32mwith\u001b[0m \u001b[0mwarnings\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcatch_warnings\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     10\u001b[0m     \u001b[0mwarnings\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msimplefilter\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"ignore\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mUserWarning\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 11\u001b[0;31m     \u001b[0;32mfrom\u001b[0m \u001b[0mlsst\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msims\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcatalogs\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mgeneration\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mdb\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mCatalogDBObject\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mChunkIterator\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     12\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     13\u001b[0m \u001b[0;32mclass\u001b[0m \u001b[0mTable\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mCatalogDBObject\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m/Users/lynnej/lsstRepos/sims_catalogs_generation/python/lsst/sims/catalogs/generation/db/__init__.py\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mspatialBounds\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0;34m*\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      2\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mObservationMetaData\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0;34m*\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 3\u001b[0;31m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mdbConnection\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0;34m*\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m      4\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0;34m.\u001b[0m\u001b[0mutils\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0;34m*\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m/Users/lynnej/lsstRepos/sims_catalogs_generation/python/lsst/sims/catalogs/generation/db/dbConnection.py\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m     13\u001b[0m                         Table, event)\n\u001b[1;32m     14\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0msqlalchemy\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mexc\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0msa_exc\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 15\u001b[0;31m \u001b[0;32mfrom\u001b[0m \u001b[0mlsst\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mdaf\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpersistence\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mDbAuth\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     16\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     17\u001b[0m \u001b[0;31m#The documentation at http://docs.sqlalchemy.org/en/rel_0_7/core/types.html#sqlalchemy.types.Numeric\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;31mImportError\u001b[0m: No module named persistence"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import lsst.sims.maf.db as db\n",
     "import lsst.sims.maf.metrics as metrics\n",
@@ -182,10 +166,9 @@
    },
    "source": [
     "If you get an error message after running the cell above saying \"ImportError: No module named lsst.sims.maf.db\", please check to be sure that you have \n",
-    "> `setup sims_maf -t sims` (or whatever is your appropriate tag). \n",
+    "> `setup sims_maf -t sims` (or whatever is your appropriate tag - if you installed via 'conda' binaries, there is no tag)\n",
     "\n",
-    "If you get an error message like \"ImportError: No module named persistence\" or \"ImportError: No module named lsst.sims.maf.metricBundles\" you have an old version of the LSST software stack installed. Please update your software by doing \n",
-    "> `eups distrib install sims_maf -t sims`."
+    "If you get an error message like \"ImportError: No module named persistence\" or \"ImportError: No module named lsst.sims.maf.metricBundles\" you have an old version of the LSST software stack installed. Please update your software by following the instructions on the [Index](./Index.ipynb) notebook."
    ]
   },
   {

diff --git a/tutorials/Writing A New Metric.ipynb b/tutorials/Writing A New Metric.ipynb
diff --git a/tutorials/images/thumb.ops2_1114_Mean_finSeeing_i_HEAL_SkyMap.png b/tutorials/images/thumb.ops2_1114_Mean_finSeeing_i_HEAL_SkyMap.png