projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
[htsworkflow.git]
/
htsworkflow
/
pipelines
/
runfolder.py
diff --git
a/htsworkflow/pipelines/runfolder.py
b/htsworkflow/pipelines/runfolder.py
index da1bbe636bccdf359616c3b69e4a5963a5e32370..669c5f03363dfc8c647730133af71678319d0336 100644
(file)
--- a/
htsworkflow/pipelines/runfolder.py
+++ b/
htsworkflow/pipelines/runfolder.py
@@
-129,10
+129,12
@@
class PipelineRun(object):
return path_fields[-1]
def _get_runfolder_name(self):
return path_fields[-1]
def _get_runfolder_name(self):
- if self.gerald is None:
- return None
- else:
+ if self.gerald:
return self.gerald.runfolder_name
return self.gerald.runfolder_name
+ elif hasattr(self.image_analysis, 'runfolder_name'):
+ return self.image_analysis.runfolder_name
+ else:
+ return None
runfolder_name = property(_get_runfolder_name)
def _get_run_dirname(self):
runfolder_name = property(_get_runfolder_name)
def _get_run_dirname(self):