Merge branch 'update_feb18' into 'master'

Added two remaining young pulsars from FGRP4

See merge request einsteinathome/fermilat-web!2

FGRP1_discoveries.html

@@ -44,7 +44,7 @@ combination, these improvements led to FGRP4 being our most sensitive survey to
 
 <p>We are very pleased to be able to announce the first set of results from FGRP4. Including the
 discovery of PSR J1906+0722 at the beginning of this survey, these bring the total number of
-gamma-ray pulsars discovered by our Einstein@Home volunteers to 19. You can find the details and
+gamma-ray pulsars discovered by our Einstein@Home volunteers to 21. You can find the details and
 plots of all the new discoveries below!</p>
 
 <p>Currently we are working very hard to study all of the results from FGRP4, and we are hoping to
@@ -686,6 +686,50 @@ gamma-ray emission as a function of pulsar rotation phase and resolve the pulse
             </tr>
             <!-- psr end //-->
             <!-- psr start //-->
+            <tr>
+              <td>
+                <table style="text-align: left; width: 100%;" border="0" cellpadding="0" cellspacing="0">
+                  <tbody>
+                    <tr>
+                      <td style="vertical-align: top;">
+                        <table style="text-align: left; width: 202px; height: 41px; font-weight: bold;" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                            <tr>
+                              <td style="vertical-align: top; background-color: rgb(204, 204, 204); text-align: center;">Pulsar J1641-5317</td>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <br>
+                      </td>
+                      <td colspan="1" rowspan="2" style="vertical-align: top;" width="460">
+                        <img style="width: 250px;" alt="J1641" src="img/fhist-J1641.png">
+                        <img style="width: 196px; height: 373px;" alt="J1641" src="img/tvsph-J1641.png">
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="vertical-align: top;">
+                        <b>Volunteers (Country):</b><br>
+                        <a href="https://einsteinathome.org/show_user.php?userid=2013">UW-Madison CAE (USA)</a> and <a href="https://einsteinathome.org/show_user.php?userid=342084">ATLAS AEI Hannover (Germany)</a><br><br>
+                        <b>Date:</b><br>
+                        30 Dec 2015<br><br>
+                        <b>Survey:</b><br>
+                        FGRP4<br><br>
+                        <b>Selected pulsar parameters:</b><br>
+                        Right ascension: 16:41<br>
+                        Declination: -53:17<br>
+                        Spin frequency: 5.71 Hz<br>
+                        First frequency derivate: -1.21 x 10<sup>-13</sup> Hz/s<br>
+                        Characteristic age: 750 kyrs<br>
+                        Spin-down power: 2.7 x 10<sup>34</sup> erg/s<br>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+                <br><hr>
+              </td>
+            </tr>
+            <!-- psr end //-->
+            <!-- psr start //-->
             <tr>
               <td>
                 <table style="text-align: left; width: 100%;" border="0" cellpadding="0" cellspacing="0">
@@ -730,6 +774,50 @@ gamma-ray emission as a function of pulsar rotation phase and resolve the pulse
             </tr>
             <!-- psr end //-->
             <!-- psr start //-->
+            <tr>
+              <td>
+                <table style="text-align: left; width: 100%;" border="0" cellpadding="0" cellspacing="0">
+                  <tbody>
+                    <tr>
+                      <td style="vertical-align: top;">
+                        <table style="text-align: left; width: 202px; height: 41px; font-weight: bold;" border="0" cellpadding="0" cellspacing="0">
+                          <tbody>
+                            <tr>
+                              <td style="vertical-align: top; background-color: rgb(204, 204, 204); text-align: center;">Pulsar J1817-1742</td>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <br>
+                      </td>
+                      <td colspan="1" rowspan="2" style="vertical-align: top;" width="460">
+                        <img style="width: 250px;" alt="J1817" src="img/fhist-J1817.png">
+                        <img style="width: 196px; height: 373px;" alt="J1817" src="img/tvsph-J1817.png">
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="vertical-align: top;">
+                        <b>Volunteers (Country):</b><br>
+                        <a href="https://einsteinathome.org/show_user.php?userid=132914">dbillenness (Canada)</a> and <a href="https://einsteinathome.org/show_user.php?userid=499225">Jon Kerfoot (USA)</a><br><br>
+                        <b>Date:</b><br>
+                        24 Dec 2015<br><br>
+                        <b>Survey:</b><br>
+                        FGRP4<br><br>
+                        <b>Selected pulsar parameters:</b><br>
+                        Right ascension: 18:17<br>
+                        Declination: -17:42<br>
+                        Spin frequency: 6.68 Hz<br>
+                        First frequency derivate: -9.18 x 10<sup>-13</sup> Hz/s<br>
+                        Characteristic age: 115 kyrs<br>
+                        Spin-down power: 2.42 x 10<sup>35</sup> erg/s<br>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+                <br><hr>
+              </td>
+            </tr>
+            <!-- psr end //-->
+            <!-- psr start //-->
             <tr>
               <td>
                 <table style="text-align: left; width: 100%;" border="0" cellpadding="0" cellspacing="0">

psrs_by_time.py

@@ -35,8 +35,9 @@ psr_timeline = np.array([[0,0],
                          [64,4], # 4 E@H Pulsars, 2013
                          [84,1], # J1906
                          [91, 13], # Next bunch of FGRP4 pulsars without J1208
-                         [100, 1],
-                         [102,0]]) # J1208
+                         [100,1], # J1208
+                         [106, 2], # J1817, J1641
+                         [114,0]]) 
 FGRP1_idx = 8
 FGRP4_idx = 9
 AEI_idx = 5
@@ -54,7 +55,7 @@ xfmt = ScalarFormatter(useOffset=False)
 fig = plt.figure(figsize=(10,5.5))
 ax = fig.add_subplot(111)
 plt.step(months, psrs,where='post',color='red',linewidth=2.0)
-plt.xticks(np.arange(2009,2017))
+plt.xticks(np.arange(2009,2019))
 plt.ylabel('Total number of pulsars discovered')
 plt.title('Timeline of gamma-ray pulsar discoveries in blind searches with Fermi LAT')
 
@@ -69,9 +70,9 @@ plt.text(months[FGRP4_idx] + 0.75, 35,'E@H\nFGRP4',ha='center')
 # Survey shading
 ax.fill_between([months[FGRP1_idx],months[FGRP1_idx+1]],[0,0],[psrs[FGRP1_idx],psrs[FGRP1_idx]],color='darkgrey')
 
-ax.fill_between([months[FGRP4_idx],months[FGRP4_idx+1],months[FGRP4_idx+1],months[-2],months[-2],months[-1]],
-                [0,0,0,0,0,0],
-                [psrs[FGRP4_idx],psrs[FGRP4_idx],psrs[FGRP4_idx+1],psrs[FGRP4_idx+1],psrs[-2],psrs[-1]],
+ax.fill_between([months[FGRP4_idx],months[FGRP4_idx+1],months[FGRP4_idx+1],months[FGRP4_idx+2],months[FGRP4_idx+2],months[-2],months[-2],months[-1]],
+                [0,0,0,0,0,0,0,0],
+                [psrs[FGRP4_idx],psrs[FGRP4_idx],psrs[FGRP4_idx+1],psrs[FGRP4_idx+1],psrs[FGRP4_idx+2],psrs[FGRP4_idx+2],psrs[-2],psrs[-1]],
                 color='grey')
 
 ax.fill_between([months[AEI_idx],months[AEI_idx + 1],months[AEI_idx + 1],months[FGRP1_idx]],
@@ -82,6 +83,7 @@ ax.spines['right'].set_visible(False)
 ax.spines['top'].set_visible(False)
 ax.xaxis.set_ticks_position('bottom')
 ax.yaxis.set_ticks_position('left')
+plt.ylim(ymin=0)
 plt.savefig('img/psrs_vs_time.png',bbox_inches='tight')
 plt.show()