Merge pull request #17 from fact-project/more_auxservices

More auxservices

Author: maxnoe

fact/auxservices/base.py

@@ -13,22 +13,26 @@ class AuxService:
 
     def __init__(self, auxdir='/fact/aux'):
         self.auxdir = auxdir
-        self.filename_template = os.path.join(
+
+    @property
+    def filename_template(self):
+        return os.path.join(
             self.auxdir, '{date:%Y}',  '{date:%m}', '{date:%d}',
             '{date:%Y%m%d}.' + self.basename + '.fits'
         )
 
-    def read_file(self, filename):
+    @classmethod
+    def read_file(cls, filename):
         with warnings.catch_warnings():
             warnings.simplefilter('ignore', category=UnitsWarning)
             table = Table.read(filename)
 
         for column in table.columns.keys():
-            if column in self.ignored_columns:
+            if column in cls.ignored_columns:
                 table.remove_column(column)
 
-            elif column in self.renames:
-                table[column].name = self.renames[column]
+            elif column in cls.renames:
+                table[column].name = cls.renames[column]
 
         for column in table.columns.keys():
             shape = table[column].shape
@@ -39,7 +43,7 @@ def read_file(self, filename):
 
         df = table.to_pandas()
 
-        for key, transform in self.transforms.items():
+        for key, transform in cls.transforms.items():
             df[key] = transform(df[key])
 
         return df

fact/auxservices/services.py

@@ -14,7 +14,10 @@ def fact_mjd_to_datetime(fact_mjd):
     'DrivePointing',
     'DriveSource',
     'FSCHumidity',
-    'FSCTemperature'
+    'FSCTemperature',
+    'FTMTriggerRates',
+    'BiasVoltage',
+    'FADTemperature',
 ]
 
 
@@ -122,3 +125,49 @@ class FSCTemperature(AuxService):
     }
     transforms = {'timestamp': fact_mjd_to_datetime}
     ignored_columns = ['QoS', ]
+
+
+class FTMTriggerRates(AuxService):
+    basename = 'FTM_CONTROL_TRIGGER_RATES'
+    renames = {
+        'Time': 'timestamp',
+        'FTMtimeStamp': 'ftm_timestamp',
+        'OnTimeCounter': 'effective_ontime',
+        'TriggerCounter': 'trigger_counter',
+        'TriggerRate': 'trigger_rate',
+        'BoardRate': 'board_rate',
+        'PatchRate': 'patch_rate',
+        'OnTime': 'ontime',
+        'ElapsedTime': 'elapsed_time',
+    }
+    transforms = {
+        'timestamp': fact_mjd_to_datetime,
+        'ftm_timestamp': lambda x: x/1e6,
+        'effective_ontime': lambda x: x/1e6,
+    }
+    ignored_columns = ['QoS', ]
+
+
+class BiasVoltage(AuxService):
+    basename = "BIAS_CONTROL_VOLTAGE"
+    renames = {
+        'Time': 'timestamp',
+        'Uout': 'bias_voltage',
+    }
+    transforms = {
+        'timestamp': fact_mjd_to_datetime,
+    }
+    ignored_columns = ['QoS', ]
+
+
+class FADTemperature(AuxService):
+    basename = "FAD_CONTROL_TEMPERATURE"
+    renames = {
+        'Time': 'timestamp',
+        'cnt': 'count',
+        'temp': 'temperature',
+    }
+    transforms = {
+        'timestamp': fact_mjd_to_datetime,
+    }
+    ignored_columns = ['QoS', ]

setup.py

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