Rubin/Roman filters, Synthpop Compatability, black hole binary fraction updates, and bug fixes

docs/PopSyCLE_example.ipynb

@@ -419,7 +419,7 @@
    "source": [
     "# Photometry\n",
     "\n",
-    "This is the last thing, where you choose the photometric band for the observations and the reddening law.\n",
+    "This is the last thing, where you choose the photometric band or bands for the observations and the reddening law.\n",
     "The final file of microlensing events is produced here as a .fits file."
    ]
   },
@@ -442,8 +442,7 @@
    ],
    "source": [
     "synthetic.refine_events(input_root = 'example', \n",
-    "                        filter_name = 'I',\n",
-    "                        photometric_system = 'ubv',\n",
+    "                        filter_dict={'ubv':['I']},\n",
     "                        red_law = 'Damineli16', \n",
     "                        overwrite = False, \n",
     "                        output_file = 'default')"

docs/PopSyCLE_example_multiples.ipynb

@@ -10,7 +10,7 @@
    "source": [
     "import warnings\n",
     "warnings.filterwarnings('ignore')\n",
-    "from popsycle import synthetic, utils, binary_utils\n",
+    "from popsycle import synthetic, utils, binary_utils, table_utils\n",
     "import numpy as np\n",
     "import matplotlib.pyplot as plt\n",
     "from astropy.table import Table\n",
@@ -831,7 +831,7 @@
    "source": [
     "# Photometry\n",
     "\n",
-    "In refine_events you specify a photometric band for the observations and the reddening law.\n",
+    "In refine_events you specify a photometric band or bands for the observations and the reddening law.\n",
     "The final file of microlensing events is produced here as a .fits file.\n",
     "To include multiples you must specify the hdf5 companion file."
    ]
@@ -860,8 +860,7 @@
    "source": [
     "synthetic.refine_events(input_root = 'example',\n",
     "                        hdf5_file_comp = 'example_companions.h5',\n",
-    "                        filter_name = 'I',\n",
-    "                        photometric_system = 'ubv',\n",
+    "                        filter_dict={'ubv':['I']},\n",
     "                        red_law = 'Damineli16', \n",
     "                        overwrite = False, \n",
     "                        output_file = 'default')"
@@ -1172,14 +1171,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "t_cut, t_cut_one_peak, t_multiples_cut_multi_peak = binary_utils.cut_Mruns(t, \n",
-    "                                                                           t_companions, \n",
-    "                                                                           t_peaks, \n",
-    "                                                                           min_mag = 22, \n",
-    "                                                                           delta_m_cut = 0.1, \n",
-    "                                                                           u0_cut = 2, \n",
-    "                                                                           ubv_filter = 'I', \n",
-    "                                                                           S_LSN = 'S')"
+    "t_cut, t_cut_one_peak, t_multiples_cut_multi_peak = table_utils.cut_Mruns(t, \n",
+    "                                                                          t_companions, \n",
+    "                                                                          t_peaks, \n",
+    "                                                                          min_mag = 22, \n",
+    "                                                                          delta_m_cut = 0.1, \n",
+    "                                                                          u0_cut = 2, \n",
+    "                                                                          ubv_filter = 'I', \n",
+    "                                                                          S_LSN = 'S')"
    ]
   },
   {

docs/PopSyCLE_example_run.ipynb

@@ -43,8 +43,7 @@
     "                                  bin_edges_number=None,\n",
     "                                  BH_kick_speed_mean=50,\n",
     "                                  NS_kick_speed_mean=400,\n",
-    "                                  photometric_system='ubv',\n",
-    "                                  filter_name='R',\n",
+    "                                  filter_dict={'ubv':['R']},\n",
     "                                  red_law='Damineli16',\n",
     "                                  multiplicity=None,\n",
     "                                  galaxia_galaxy_model_filename= '/g/lu/code/galaxia/docs/galaxyModelParams_PopSyCLEv3.txt')"

docs/PopSyCLE_example_slurm.ipynb

@@ -50,7 +50,7 @@
     "                               n_cores_per_node=64,\n",
     "                               n_nodes_max=3072,\n",
     "                               walltime_max=24,\n",
-    "                               additional_lines=['module load cray-hdf5/1.10.5.2', 'export HDF5_USE_FILE_LOCKING=FALSE'])"
+    "                               additional_lines=['module load cray-hdf5-parallel', 'export HDF5_USE_FILE_LOCKING=FALSE'])"
    ]
   },
   {
@@ -78,8 +78,7 @@
     "                                  bin_edges_number=None,\n",
     "                                  BH_kick_speed_mean=50,\n",
     "                                  NS_kick_speed_mean=400,\n",
-    "                                  photometric_system='ubv',\n",
-    "                                  filter_name='r',\n",
+    "                                  filter_dict={'ubv':['R']},\n",
     "                                  red_law='Damineli16',\n",
     "                                  multiplicity=None)"
    ]