added 'conf6' as options
Merge branch 'OnePathWorkflow' of https://github.com/CJLST/ZZAnalysis into OnePathWorkflow