Merge pull request #26 from fact-project/fix_observation_blocks

Fix observation blocks, fix #25

Author: maxnoe

examples/plot_qla.py

@@ -0,0 +1,14 @@
+from fact import qla
+from fact.credentials import create_factdb_engine
+import matplotlib.pyplot as plt
+
+
+db = create_factdb_engine()
+
+data = qla.get_qla_data(20161124, database=db)
+binned = qla.bin_qla_data(data, bin_width_minutes=20)
+
+qla.plot_qla(binned)
+
+plt.show()
+

fact/qla.py

@@ -20,9 +20,8 @@ def dorner_binning(data, bin_width_minutes=20):
 def groupby_observation_blocks(runs):
     ''' Groupby for consecutive runs of the same source'''
     runs = runs.sort_values('fRunStart')
-    next_is_different = runs.fSourceName != runs.fSourceName.shift(-1)
-    next_is_different.iloc[-1] = False
-    observation_blocks = next_is_different.cumsum()
+    new_source = runs.fSourceName != runs.fSourceName.shift(1)
+    observation_blocks = new_source.cumsum()
     return runs.groupby(observation_blocks)
 
 

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='pyfact',
-    version='0.8.1',
+    version='0.8.2',
     description='A module containing useful methods for working with fact',
     url='http://github.com/fact-project/pyfact',
     author='Maximilian Noethe, Dominik Neise',