Merge pull request #38 from GernotMaier/light-curve-bug-fixes

Light curve bug fixes

Author: GernotMaier

eventdisplay_anasum/runlist_from_time_bins.C

@@ -93,8 +93,6 @@ void runlist_from_time_bins( string iAnaSumFile, string iMJDIntervalFile, bool i
      // loop over all time intervals
      for( unsigned n = 0; n < min_max.size(); n++ )
      {
-         bool bFound = false;
-
          vector< int > iRunList;
          // loop over all runs
          for( int i = 0; i < t->GetEntries(); i++ )
@@ -107,18 +105,40 @@ void runlist_from_time_bins( string iAnaSumFile, string iMJDIntervalFile, bool i
              {
                 iNruns[n]++;
                 iT[n] += tOn;
-                bFound = true;
                 iRunList.push_back( runOn );
              }
          }
+         runsPerTimeBin.push_back( iRunList );
+     }
+     // check for missing runs
+     for( int i = 0; i < t->GetEntries(); i++ )
+     {
+         t->GetEntry( i );
+         if( runOn < 0 )
+         {
+             continue;
+         }
+         bool bFound = false;
+         for(unsigned int t = 0; t < runsPerTimeBin.size(); t++ )
+         {
+             for(unsigned s = 0; s < runsPerTimeBin[t].size(); s++ )
+             {
+                 if( runOn == runsPerTimeBin[t][s] )
+                 {
+                     bFound = true;
+                     break;
+                 }
+             }
+         }
          if( !bFound )
          {
               iMissingRun.push_back( runOn );
               cout << "Missing run " << runOn << "\t" << MJDOn << endl;
          }
-         runsPerTimeBin.push_back( iRunList );
+    }
+
+
 
-     }
 
      cout << "Total number of missing runs: " << iMissingRun.size() << endl;
 

v2dl5/light_curves/binary_plotting.py

@@ -124,11 +124,14 @@ def _get_number_columns_and_rows(self, number):
 
         """
         n_columns = 4
+        fig_size = (10, 4)
         if number > 9:
             n_columns = 6
-        if number > 12:
+            fig_size = (12, 6)
+        if number > 16:
             n_columns = 8
-        return n_columns, math.ceil(number / n_columns)
+            fig_size = (16, 10)
+        return n_columns, math.ceil(number / n_columns), fig_size
 
     def plot_flux_vs_phase_for_individual_orbits(
         self, instrument, file_type=".pdf", figure_dir="./figures/"
@@ -147,9 +150,8 @@ def plot_flux_vs_phase_for_individual_orbits(
         y_min, y_max = self._global_flux_extrema(data)
         fontsize = 6
 
-        n_columns, n_rows = self._get_number_columns_and_rows(len(orbits))
+        n_columns, n_rows, figsize = self._get_number_columns_and_rows(len(orbits))
         self._logger.info(f"Number of columns: {n_columns}, number of rows: {n_rows}")
-        figsize = (16, 10) if n_rows > 1 else (10, 4)
         plt.figure(figsize=figsize)
         for i, orbit_id in enumerate(orbits):
             axes = plt.subplot(n_rows, n_columns, i + 1)