From f990238ec8e106f94a7d21fe2dc98c0175ad2007 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 14 Apr 2015 13:16:24 +0000
Subject: [PATCH] modified constructor signature to follow conventions
---
src/python/dm/common/objects/observedFile.py | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/python/dm/common/objects/observedFile.py b/src/python/dm/common/objects/observedFile.py
index 2ffee284..8ef9ac2b 100755
--- a/src/python/dm/common/objects/observedFile.py
+++ b/src/python/dm/common/objects/observedFile.py
@@ -7,10 +7,14 @@ class ObservedFile(DmObject):
DEFAULT_KEY_LIST = [ 'path', 'lastUpdatedTimestamp' ]
- def __init__(self, path=None, dict={}):
+ def __init__(self, dict={}, filePath=None, daqPath=None, experiment=None):
DmObject.__init__(self, dict)
- if path:
- self['path'] = path
+ if filePath:
+ self['filePath'] = filePath
+ if daqPath:
+ self['daqPath'] = daqPath
+ if experiment:
+ self['experiment'] = experiment
def setLastUpdatedTimestampToNow(self):
self['lastUpdateTimestamp'] = time.time()
@@ -18,8 +22,14 @@ class ObservedFile(DmObject):
def getLastUpdatedTimestamp(self):
self.get('lastUpdateTimestamp')
- def getPath(self):
- return self.get('path')
+ def getFilePath(self):
+ return self.get('filePath')
+
+ def getDaqPath(self):
+ return self.get('daqPath')
+
+ def getExperiment(self):
+ return self.get('experiment')
####################################################################
# Testing
--
GitLab