diff --git a/src/python/dm/common/objects/observedFile.py b/src/python/dm/common/objects/observedFile.py index 2ffee2845e79cf612192a42b03dd9b256baef2f1..8ef9ac2bef320732693761efd6364ddccc8ec2f1 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